From pypy.commits at gmail.com Wed Jan 1 04:19:22 2020 From: pypy.commits at gmail.com (mattip) Date: Wed, 01 Jan 2020 01:19:22 -0800 (PST) Subject: [pypy-commit] pypy default: update license for new year, ignor pypy/lib files for portable builds Message-ID: <5e0c641a.1c69fb81.e3b44.d287@mx.google.com> Author: Matti Picus Branch: Changeset: r98431:389122234122 Date: 2020-01-01 11:17 +0200 http://bitbucket.org/pypy/pypy/changeset/389122234122/ Log: update license for new year, ignor pypy/lib files for portable builds diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -17,8 +17,8 @@ ^site-packages$ ^site-packages/.*$ ^site-packages/.*$ -^bin$ ^pypy/bin/pypy-c +^pypy/lib/ ^pypy/module/cpyext/src/.+\.o$ ^pypy/module/cpyext/src/.+\.obj$ ^pypy/module/cpyext/test/.+\.errors$ diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py --- a/pypy/doc/conf.py +++ b/pypy/doc/conf.py @@ -59,7 +59,7 @@ # General information about the project. project = u'PyPy' -copyright = u'2019, The PyPy Project' +copyright = u'2020, The PyPy Project' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the From pypy.commits at gmail.com Wed Jan 1 04:19:24 2020 From: pypy.commits at gmail.com (mattip) Date: Wed, 01 Jan 2020 01:19:24 -0800 (PST) Subject: [pypy-commit] pypy py3.6: merge default into branch Message-ID: <5e0c641c.1c69fb81.111cf.7069@mx.google.com> Author: Matti Picus Branch: py3.6 Changeset: r98432:73c04f01d522 Date: 2020-01-01 11:18 +0200 http://bitbucket.org/pypy/pypy/changeset/73c04f01d522/ Log: merge default into branch diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -19,8 +19,8 @@ ^site-packages$ ^site-packages/.*$ ^site-packages/.*$ -^bin$ ^pypy/bin/pypy-c +^pypy/lib/ ^pypy/module/cpyext/src/.+\.o$ ^pypy/module/cpyext/src/.+\.obj$ ^pypy/module/cpyext/test/.+\.errors$ diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py --- a/pypy/doc/conf.py +++ b/pypy/doc/conf.py @@ -59,7 +59,7 @@ # General information about the project. project = u'PyPy' -copyright = u'2019, The PyPy Project' +copyright = u'2020, The PyPy Project' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/pypy/objspace/std/test/test_unicodeobject.py b/pypy/objspace/std/test/test_unicodeobject.py --- a/pypy/objspace/std/test/test_unicodeobject.py +++ b/pypy/objspace/std/test/test_unicodeobject.py @@ -253,6 +253,9 @@ assert u''.rsplit('aaa') == [u''] assert u'a\nb\u1680c'.rsplit() == [u'a', u'b', u'c'] + def test_rsplit_bug(self): + assert u'Vestur- og Mið'.rsplit() == [u'Vestur-', u'og', u'Mið'] + def test_center(self): s=u"a b" assert s.center(0) == u"a b" diff --git a/rpython/rlib/rstring.py b/rpython/rlib/rstring.py --- a/rpython/rlib/rstring.py +++ b/rpython/rlib/rstring.py @@ -139,7 +139,7 @@ if by is None: res = [] - i = len(value) - 1 + i = _decr(value, len(value), isutf8) while True: # starting from the end, find the end of the next word while i >= 0: diff --git a/rpython/rlib/test/test_rstring.py b/rpython/rlib/test/test_rstring.py --- a/rpython/rlib/test/test_rstring.py +++ b/rpython/rlib/test/test_rstring.py @@ -88,6 +88,7 @@ assert rsplit('baba', 'a', isutf8=1) == ['b', 'b', ''] assert rsplit('b b', isutf8=1) == ['b', 'b'] assert rsplit('b\xe1\x9a\x80b', isutf8=1) == ['b', 'b'] + assert rsplit('b\xe1\x9a\x80', isutf8=1) == ['b'] def test_string_replace(): def check_replace(value, sub, *args, **kwargs): From pypy.commits at gmail.com Wed Jan 1 10:54:21 2020 From: pypy.commits at gmail.com (cfbolz) Date: Wed, 01 Jan 2020 07:54:21 -0800 (PST) Subject: [pypy-commit] pypy py3.6: remove repeated function Message-ID: <5e0cc0ad.1c69fb81.df8e5.a2c3@mx.google.com> Author: Carl Friedrich Bolz-Tereick Branch: py3.6 Changeset: r98433:11484c9b7bd0 Date: 2020-01-01 16:52 +0100 http://bitbucket.org/pypy/pypy/changeset/11484c9b7bd0/ Log: remove repeated function diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseobjspace.py +++ b/pypy/interpreter/baseobjspace.py @@ -1740,16 +1740,6 @@ def utf8_w(self, w_obj): return w_obj.utf8_w(self) - def utf8_0_w(self, w_obj): - "Like utf_w, but rejects strings with NUL bytes." - from rpython.rlib import rstring - result = w_obj.utf8_w(self) - if '\x00' in result: - raise oefmt(self.w_TypeError, - "argument must be a string without NUL " - "characters") - return rstring.assert_str0(result) - def convert_to_w_unicode(self, w_obj): return w_obj.convert_to_w_unicode(self) From pypy.commits at gmail.com Wed Jan 1 10:54:23 2020 From: pypy.commits at gmail.com (cfbolz) Date: Wed, 01 Jan 2020 07:54:23 -0800 (PST) Subject: [pypy-commit] pypy py3.6: merge heads Message-ID: <5e0cc0af.1c69fb81.76af.9659@mx.google.com> Author: Carl Friedrich Bolz-Tereick Branch: py3.6 Changeset: r98434:1a321e4e7973 Date: 2020-01-01 16:53 +0100 http://bitbucket.org/pypy/pypy/changeset/1a321e4e7973/ Log: merge heads diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseobjspace.py +++ b/pypy/interpreter/baseobjspace.py @@ -1740,16 +1740,6 @@ def utf8_w(self, w_obj): return w_obj.utf8_w(self) - def utf8_0_w(self, w_obj): - "Like utf_w, but rejects strings with NUL bytes." - from rpython.rlib import rstring - result = w_obj.utf8_w(self) - if '\x00' in result: - raise oefmt(self.w_TypeError, - "argument must be a string without NUL " - "characters") - return rstring.assert_str0(result) - def convert_to_w_unicode(self, w_obj): return w_obj.convert_to_w_unicode(self) From pypy.commits at gmail.com Wed Jan 1 11:17:34 2020 From: pypy.commits at gmail.com (arigo) Date: Wed, 01 Jan 2020 08:17:34 -0800 (PST) Subject: [pypy-commit] pypy default: Move the 'assert pos >= 0' before the 'code[pos]', to avoid extra checking for Message-ID: <5e0cc61e.1c69fb81.b0e74.9711@mx.google.com> Author: Armin Rigo Branch: Changeset: r98435:04a0915490aa Date: 2020-01-01 17:17 +0100 http://bitbucket.org/pypy/pypy/changeset/04a0915490aa/ Log: Move the 'assert pos >= 0' before the 'code[pos]', to avoid extra checking for negative pos when indexing diff --git a/rpython/rlib/rutf8.py b/rpython/rlib/rutf8.py --- a/rpython/rlib/rutf8.py +++ b/rpython/rlib/rutf8.py @@ -153,22 +153,20 @@ """Gives the position of the previous codepoint. 'pos' must not be zero. """ - assert pos != 0 pos -= 1 + assert pos >= 0 if pos >= len(code): # for the case where pos - 1 == len(code): - assert pos >= 0 return pos # assume there is an extra '\x00' character chr1 = ord(code[pos]) if chr1 <= 0x7F: - assert pos >= 0 return pos pos -= 1 + assert pos >= 0 if ord(code[pos]) >= 0xC0: - assert pos >= 0 return pos pos -= 1 + assert pos >= 0 if ord(code[pos]) >= 0xC0: - assert pos >= 0 return pos pos -= 1 assert pos >= 0 From pypy.commits at gmail.com Thu Jan 2 04:45:22 2020 From: pypy.commits at gmail.com (arigo) Date: Thu, 02 Jan 2020 01:45:22 -0800 (PST) Subject: [pypy-commit] cffi default: Issue 436: improve docs and error message Message-ID: <5e0dbbb2.1c69fb81.131a5.462b@mx.google.com> Author: Armin Rigo Branch: Changeset: r3317:b9a98b040bd7 Date: 2020-01-02 10:45 +0100 http://bitbucket.org/cffi/cffi/changeset/b9a98b040bd7/ Log: Issue 436: improve docs and error message diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c --- a/c/_cffi_backend.c +++ b/c/_cffi_backend.c @@ -4974,8 +4974,8 @@ if (sflags & SF_STD_FIELD_POS) { PyErr_Format(FFIError, "%s: %s%s%s (cdef says %zd, but C compiler says %zd)." - " fix it or use \"...;\" in the cdef for %s to " - "make it flexible", + " fix it or use \"...;\" as the last field in the " + "cdef for %s to make it flexible", ct->ct_name, msg1, txt, msg2, cdef_value, compiler_value, ct->ct_name); diff --git a/doc/source/cdef.rst b/doc/source/cdef.rst --- a/doc/source/cdef.rst +++ b/doc/source/cdef.rst @@ -235,7 +235,12 @@ byte. (Note that the packed attribute has no effect on bit fields so far, which mean that they may be packed differently than on GCC. Also, this has no effect on structs declared with ``"...;"``---more -about it later in `Letting the C compiler fill the gaps`_.) +about it later in `Letting the C compiler fill the gaps`_. In +particular, if your C source uses other attributes like +``__attribute__((aligned(16)))``, there is no way to declare this fact +in the ``cdef()``, but you can generally just declare the struct with +``"...;"`` as the last field.) + *New in version 1.12:* In ABI mode, you can also pass ``pack=n``, with an integer ``n`` which must be a power of two. Then the alignment of any field is limited to ``n`` if it would otherwise be @@ -471,10 +476,12 @@ ``cdef()`` at various places, in order to ask the C compiler to fill in the details. These places are: -* structure declarations: any ``struct { }`` that ends with "``...;``" as - the last "field" is - partial: it may be missing fields and/or have them declared out of order. - This declaration will be corrected by the compiler. (But note that you +* structure declarations: any ``struct { }`` or ``union { }`` that ends + with "``...;``" as the last "field" is partial: it may be missing + fields, have them declared out of order, use non-standard alignment, + etc. Precisely, the field offsets, total struct size, and total + struct alignment deduced by looking at the ``cdef`` are not relied + upon and will instead be corrected by the compiler. (But note that you can only access fields that you declared, not others.) Any ``struct`` declaration which doesn't use "``...``" is assumed to be exact, but this is checked: you get an error if it is not correct. From pypy.commits at gmail.com Thu Jan 2 05:08:18 2020 From: pypy.commits at gmail.com (arigo) Date: Thu, 02 Jan 2020 02:08:18 -0800 (PST) Subject: [pypy-commit] pypy py3.6: Issue 3136: Windows: os.putenv() Message-ID: <5e0dc112.1c69fb81.42e1a.408e@mx.google.com> Author: Armin Rigo Branch: py3.6 Changeset: r98436:1697fc0bff5d Date: 2020-01-02 11:07 +0100 http://bitbucket.org/pypy/pypy/changeset/1697fc0bff5d/ Log: Issue 3136: Windows: os.putenv() diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py --- a/pypy/module/posix/interp_posix.py +++ b/pypy/module/posix/interp_posix.py @@ -909,11 +909,20 @@ @unwrap_spec(name=unicode, value=unicode) def putenv(space, name, value): """Change or add an environment variable.""" + # Search from index 1 because on Windows starting '=' is allowed for + # defining hidden environment variables. + if len(name) == 0 or u'=' in name[1:]: + raise oefmt(space.w_ValueError, "illegal environment variable name") + # len includes space for '=' and a trailing NUL if len(name) + len(value) + 2 > rwin32._MAX_ENV: raise oefmt(space.w_ValueError, "the environment variable is longer than %d " "characters", rwin32._MAX_ENV) + + if u'\x00' in name or u'\x00' in value: + raise oefmt(space.w_ValueError, "embedded null character") + try: rwin32._wputenv(name, value) except OSError as e: diff --git a/pypy/module/posix/test/test_interp_posix.py b/pypy/module/posix/test/test_interp_posix.py --- a/pypy/module/posix/test/test_interp_posix.py +++ b/pypy/module/posix/test/test_interp_posix.py @@ -69,3 +69,9 @@ cc = os.cpu_count() assert cc is None or (isinstance(cc, int) and cc > 0) """ + + def test_putenv_invalid_name(self): + """ + import os + raises(ValueError, os.putenv, "foo=bar", "xxx") + """ From pypy.commits at gmail.com Thu Jan 2 05:27:33 2020 From: pypy.commits at gmail.com (mattip) Date: Thu, 02 Jan 2020 02:27:33 -0800 (PST) Subject: [pypy-commit] benchmarks default: add a TODO with possible benchmark candidates Message-ID: <5e0dc595.1c69fb81.8707.ccc9@mx.google.com> Author: Matti Picus Branch: Changeset: r391:88a67ec6f3c4 Date: 2020-01-02 12:26 +0200 http://bitbucket.org/pypy/benchmarks/changeset/88a67ec6f3c4/ Log: add a TODO with possible benchmark candidates diff --git a/TODO b/TODO new file mode 100644 --- /dev/null +++ b/TODO @@ -0,0 +1,4 @@ +Possible benchmarks to explore: +- Web-site frameworks https://github.com/klen/py-frameworks-bench +- Exploration of django https://lincolnloop.com/blog/faster-django-sites-pypy/ +- black From pypy.commits at gmail.com Thu Jan 2 05:29:13 2020 From: pypy.commits at gmail.com (arigo) Date: Thu, 02 Jan 2020 02:29:13 -0800 (PST) Subject: [pypy-commit] pypy py3.7-bpo-27541: Close branch py3.7-bpo-27541 Message-ID: <5e0dc5f9.1c69fb81.80802.3d3d@mx.google.com> Author: Armin Rigo Branch: py3.7-bpo-27541 Changeset: r98437:ba114d9875d7 Date: 2020-01-02 10:28 +0000 http://bitbucket.org/pypy/pypy/changeset/ba114d9875d7/ Log: Close branch py3.7-bpo-27541 From pypy.commits at gmail.com Thu Jan 2 05:29:42 2020 From: pypy.commits at gmail.com (arigo) Date: Thu, 02 Jan 2020 02:29:42 -0800 (PST) Subject: [pypy-commit] pypy py3.7: Merged in py3.7-bpo-27541 (pull request #692) Message-ID: <5e0dc616.1c69fb81.a02e0.47c9@mx.google.com> Author: Armin Rigo Branch: py3.7 Changeset: r98438:c509e0d987c3 Date: 2020-01-02 10:28 +0000 http://bitbucket.org/pypy/pypy/changeset/c509e0d987c3/ Log: Merged in py3.7-bpo-27541 (pull request #692) Implement bpo-27541: Reprs of subclasses of some classes now contain actual type name diff --git a/lib_pypy/_collections.py b/lib_pypy/_collections.py --- a/lib_pypy/_collections.py +++ b/lib_pypy/_collections.py @@ -211,14 +211,14 @@ def __repr__(self): threadlocalattr = '__repr' + str(_thread_ident()) if threadlocalattr in self.__dict__: - return 'deque([...])' + return '%s([...])' % (self.__class__.__name__,) else: self.__dict__[threadlocalattr] = True try: if self.maxlen is not None: - return 'deque(%r, maxlen=%s)' % (list(self), self.maxlen) + return '%s(%r, maxlen=%s)' % (self.__class__.__name__, list(self), self.maxlen) else: - return 'deque(%r)' % (list(self),) + return '%s(%r)' % (self.__class__.__name__, list(self)) finally: del self.__dict__[threadlocalattr] @@ -411,10 +411,10 @@ def __repr__(self, recurse=set()): if id(self) in recurse: - return "defaultdict(...)" + return "%s(...)" % (self.__class__.__name__,) try: recurse.add(id(self)) - return "defaultdict(%s, %s)" % (repr(self.default_factory), super(defaultdict, self).__repr__()) + return "%s(%s, %s)" % (self.__class__.__name__, repr(self.default_factory), super(defaultdict, self).__repr__()) finally: recurse.remove(id(self)) diff --git a/pypy/module/_collections/app_defaultdict.py b/pypy/module/_collections/app_defaultdict.py --- a/pypy/module/_collections/app_defaultdict.py +++ b/pypy/module/_collections/app_defaultdict.py @@ -40,7 +40,7 @@ factoryrepr = repr(self.default_factory) finally: recurse.remove(id(self)) - return "defaultdict(%s, %s)" % (factoryrepr, dictrepr) + return "%s(%s, %s)" % (self.__class__.__name__, factoryrepr, dictrepr) def copy(self): return type(self)(self.default_factory, self) diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py --- a/pypy/module/_collections/interp_deque.py +++ b/pypy/module/_collections/interp_deque.py @@ -536,7 +536,7 @@ maxlenrepr = '' else: maxlenrepr = ', maxlen=%d' % (d.maxlen,) - return 'deque(%s%s)' % (listrepr, maxlenrepr) + return '%s(%s%s)' % (d.__class__.__name__, listrepr, maxlenrepr) """, filename=__file__) dequerepr = app.interphook("dequerepr") diff --git a/pypy/module/_collections/test/test_defaultdict.py b/pypy/module/_collections/test/test_defaultdict.py --- a/pypy/module/_collections/test/test_defaultdict.py +++ b/pypy/module/_collections/test/test_defaultdict.py @@ -98,4 +98,10 @@ pass d = X.__new__(X) d.__init__(d.mydefault) - assert repr(d).endswith('defaultdict(..., {})>, {})') + assert repr(d).endswith('X(..., {})>, {})') + + def test_subclass_repr(self): + import _collections + class subclass(_collections.defaultdict): + pass + assert repr(subclass()) == 'subclass(None, {})' diff --git a/pypy/module/_collections/test/test_deque.py b/pypy/module/_collections/test/test_deque.py --- a/pypy/module/_collections/test/test_deque.py +++ b/pypy/module/_collections/test/test_deque.py @@ -448,3 +448,9 @@ elements = 'ABCDEFGHI' d = deque([-2, -1, 0, 0, 1, 2]) assert d.index(0, -4*sys.maxsize, 4*sys.maxsize) == 2 + + def test_subclass_repr(self): + from _collections import deque + class subclass(deque): + pass + assert repr(subclass()) == 'subclass([])' diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py --- a/pypy/module/array/interp_array.py +++ b/pypy/module/array/interp_array.py @@ -766,8 +766,9 @@ # Misc methods def descr_repr(self, space): + cls_name = space.type(self).getname(space) if self.len == 0: - return space.newtext("array('%s')" % self.typecode) + return space.newtext("%s('%s')" % (cls_name, self.typecode)) elif self.typecode == "u": try: w_unicode = self.descr_tounicode(space) @@ -778,11 +779,11 @@ r = "<%s>" % (space.text_w(w_exc_value),) else: r = space.text_w(space.repr(w_unicode)) - s = "array('%s', %s)" % (self.typecode, r) + s = "%s('%s', %s)" % (cls_name, self.typecode, r) return space.newtext(s) else: r = space.repr(self.descr_tolist(space)) - s = "array('%s', %s)" % (self.typecode, space.text_w(r)) + s = "%s('%s', %s)" % (cls_name, self.typecode, space.text_w(r)) return space.newtext(s) def check_valid_unicode(self, space, s): diff --git a/pypy/module/array/test/test_array.py b/pypy/module/array/test/test_array.py --- a/pypy/module/array/test/test_array.py +++ b/pypy/module/array/test/test_array.py @@ -876,25 +876,25 @@ def extend(self, lst): self.append(10) - assert repr(mya('u', 'hi')) == "array('u', 'hi')" - assert repr(mya('i', [1, 2, 3])) == "array('i', [1, 2, 3])" - assert repr(mya('i', (1, 2, 3))) == "array('i', [1, 2, 3])" + assert repr(mya('u', 'hi')) == "mya('u', 'hi')" + assert repr(mya('i', [1, 2, 3])) == "mya('i', [1, 2, 3])" + assert repr(mya('i', (1, 2, 3))) == "mya('i', [1, 2, 3])" a = mya('i') a.fromlist([1, 2, 3]) - assert repr(a) == "array('i', [7])" + assert repr(a) == "mya('i', [7])" a = mya('b') a.fromstring(b'hi') - assert repr(a) == "array('b', [8])" + assert repr(a) == "mya('b', [8])" a = mya('u') a.fromunicode('hi') - assert repr(a) == "array('u', '9')" + assert repr(a) == "mya('u', '9')" a = mya('i') a.extend([1, 2, 3]) - assert repr(a) == "array('i', [10])" + assert repr(a) == "mya('i', [10])" def test_override_to(self): class mya(self.array): @@ -911,9 +911,9 @@ assert mya('u', 'hi').tobytes() == 'str' assert mya('u', 'hi').tounicode() == 'unicode' - assert repr(mya('u', 'hi')) == "array('u', 'hi')" - assert repr(mya('i', [1, 2, 3])) == "array('i', [1, 2, 3])" - assert repr(mya('i', (1, 2, 3))) == "array('i', [1, 2, 3])" + assert repr(mya('u', 'hi')) == "mya('u', 'hi')" + assert repr(mya('i', [1, 2, 3])) == "mya('i', [1, 2, 3])" + assert repr(mya('i', (1, 2, 3))) == "mya('i', [1, 2, 3])" def test_unicode_outofrange(self): input_unicode = u'\x01\u263a\x00\ufeff' @@ -1123,6 +1123,12 @@ struct.pack_into('>H', view, 1, 0x1234) assert a.tobytes() == b'ab\x12\x34ef' + def test_subclass_repr(self): + import array + class subclass(self.array): + pass + assert repr(subclass('i')) == "subclass('i')" + class AppTestArrayReconstructor: spaceconfig = dict(usemodules=('array', 'struct')) diff --git a/pypy/module/itertools/interp_itertools.py b/pypy/module/itertools/interp_itertools.py --- a/pypy/module/itertools/interp_itertools.py +++ b/pypy/module/itertools/interp_itertools.py @@ -27,12 +27,13 @@ def repr_w(self): space = self.space + cls_name = space.type(self).getname(space) c = space.text_w(space.repr(self.w_c)) if self.single_argument(): - s = 'count(%s)' % (c,) + s = '%s(%s)' % (cls_name, c) else: step = space.text_w(space.repr(self.w_step)) - s = 'count(%s, %s)' % (c, step) + s = '%s(%s, %s)' % (cls_name, c, step) return self.space.newtext(s) def reduce_w(self): @@ -107,11 +108,13 @@ return self.space.newint(self.count) def repr_w(self): - objrepr = self.space.text_w(self.space.repr(self.w_obj)) + space = self.space + cls_name = space.type(self).getname(space) + objrepr = self.space.text_w(space.repr(self.w_obj)) if self.counting: - s = 'repeat(%s, %d)' % (objrepr, self.count) + s = '%s(%s, %d)' % (cls_name, objrepr, self.count) else: - s = 'repeat(%s)' % (objrepr,) + s = '%s(%s)' % (cls_name, objrepr) return self.space.newtext(s) def descr_reduce(self): diff --git a/pypy/module/itertools/test/test_itertools.py b/pypy/module/itertools/test/test_itertools.py --- a/pypy/module/itertools/test/test_itertools.py +++ b/pypy/module/itertools/test/test_itertools.py @@ -36,6 +36,12 @@ raises(TypeError, itertools.count, 'a') raises(TypeError, itertools.count, []) + def test_count_subclass_repr(self): + import itertools + class subclass(itertools.count): + pass + assert repr(subclass(123)) == 'subclass(123)' + def test_repeat(self): import itertools @@ -99,6 +105,12 @@ r = itertools.repeat('a', -3) assert operator.length_hint(r, 3) == 0 + def test_repeat_subclass_repr(self): + import itertools + class subclass(itertools.repeat): + pass + assert repr(subclass('foobar')) == "subclass('foobar')" + def test_takewhile(self): import itertools diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py --- a/pypy/objspace/std/bytearrayobject.py +++ b/pypy/objspace/std/bytearrayobject.py @@ -222,11 +222,13 @@ def descr_repr(self, space): s, start, end, _ = self._convert_idx_params(space, None, None) + cls_name = space.type(self).getname(space) # Good default if there are no replacements. - buf = StringBuilder(len("bytearray(b'')") + (end - start)) + buf = StringBuilder(len(cls_name) + len("(b'')") + (end - start)) - buf.append("bytearray(b") + buf.append(cls_name) + buf.append("(b") quote = "'" for i in range(start, end): c = s[i] diff --git a/pypy/objspace/std/test/test_bytearrayobject.py b/pypy/objspace/std/test/test_bytearrayobject.py --- a/pypy/objspace/std/test/test_bytearrayobject.py +++ b/pypy/objspace/std/test/test_bytearrayobject.py @@ -764,3 +764,8 @@ assert x.find(b'fe') == -1 assert x.index(b'f', 2, 11) == 5 assert x.__alloc__() == 14 + + def test_subclass_repr(self): + class subclass(bytearray): + pass + assert repr(subclass(b'test')) == "subclass(b'test')" From pypy.commits at gmail.com Thu Jan 2 08:19:34 2020 From: pypy.commits at gmail.com (mattip) Date: Thu, 02 Jan 2020 05:19:34 -0800 (PST) Subject: [pypy-commit] benchmarks chameleon: remove files Message-ID: <5e0dede6.1c69fb81.247bc.f575@mx.google.com> Author: Matti Picus Branch: chameleon Changeset: r392:0df6fffec28d Date: 2020-01-01 07:55 +0200 http://bitbucket.org/pypy/benchmarks/changeset/0df6fffec28d/ Log: remove files diff too long, truncating to 2000 out of 2819 lines diff --git a/lib/chameleon/.git/HEAD b/lib/chameleon/.git/HEAD deleted file mode 100644 --- a/lib/chameleon/.git/HEAD +++ /dev/null @@ -1,1 +0,0 @@ -ref: refs/heads/master diff --git a/lib/chameleon/.git/config b/lib/chameleon/.git/config deleted file mode 100644 --- a/lib/chameleon/.git/config +++ /dev/null @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = https://github.com/malthe/chameleon.git - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/lib/chameleon/.git/description b/lib/chameleon/.git/description deleted file mode 100644 --- a/lib/chameleon/.git/description +++ /dev/null @@ -1,1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/lib/chameleon/.git/hooks/applypatch-msg.sample b/lib/chameleon/.git/hooks/applypatch-msg.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff --git a/lib/chameleon/.git/hooks/commit-msg.sample b/lib/chameleon/.git/hooks/commit-msg.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff --git a/lib/chameleon/.git/hooks/fsmonitor-watchman.sample b/lib/chameleon/.git/hooks/fsmonitor-watchman.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/fsmonitor-watchman.sample +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 1) and a time in nanoseconds -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $time) = @ARGV; - -# Check the hook interface version - -if ($version == 1) { - # convert nanoseconds to seconds - $time = int $time / 1000000000; -} else { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree; -if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $git_work_tree = Win32::GetCwd(); - $git_work_tree =~ tr/\\/\//; -} else { - require Cwd; - $git_work_tree = Cwd::cwd(); -} - -my $retry = 1; - -launch_watchman(); - -sub launch_watchman { - - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $time but were not transient (ie created after - # $time but no longer exist). - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - # - # The category of transient files that we want to ignore will have a - # creation clock (cclock) newer than $time_t value and will also not - # currently exist. - - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] - }] - END - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; }; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - my $json_pkg; - eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; - } or do { - require JSON::PP; - $json_pkg = "JSON::PP"; - }; - - my $o = $json_pkg->new->utf8->decode($response); - - if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { - print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; - $retry--; - qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - print "/\0"; - eval { launch_watchman() }; - exit 0; - } - - die "Watchman: $o->{error}.\n" . - "Falling back to scanning...\n" if $o->{error}; - - binmode STDOUT, ":utf8"; - local $, = "\0"; - print @{$o->{files}}; -} diff --git a/lib/chameleon/.git/hooks/post-update.sample b/lib/chameleon/.git/hooks/post-update.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff --git a/lib/chameleon/.git/hooks/pre-applypatch.sample b/lib/chameleon/.git/hooks/pre-applypatch.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff --git a/lib/chameleon/.git/hooks/pre-commit.sample b/lib/chameleon/.git/hooks/pre-commit.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/lib/chameleon/.git/hooks/pre-push.sample b/lib/chameleon/.git/hooks/pre-push.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/lib/chameleon/.git/hooks/pre-rebase.sample b/lib/chameleon/.git/hooks/pre-rebase.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/lib/chameleon/.git/hooks/pre-receive.sample b/lib/chameleon/.git/hooks/pre-receive.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/lib/chameleon/.git/hooks/prepare-commit-msg.sample b/lib/chameleon/.git/hooks/prepare-commit-msg.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff --git a/lib/chameleon/.git/hooks/update.sample b/lib/chameleon/.git/hooks/update.sample deleted file mode 100755 --- a/lib/chameleon/.git/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/lib/chameleon/.git/index b/lib/chameleon/.git/index deleted file mode 100644 index b5bf8295eb5fd92d033d4c208691b21945fbb726..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 GIT binary patch [cut] diff --git a/lib/chameleon/.git/info/exclude b/lib/chameleon/.git/info/exclude deleted file mode 100644 --- a/lib/chameleon/.git/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/lib/chameleon/.git/logs/HEAD b/lib/chameleon/.git/logs/HEAD deleted file mode 100644 --- a/lib/chameleon/.git/logs/HEAD +++ /dev/null @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 559ab649c979fa77467982b5feb254b665f92950 mattip 1577804602 +0200 clone: from https://github.com/malthe/chameleon.git diff --git a/lib/chameleon/.git/logs/refs/heads/master b/lib/chameleon/.git/logs/refs/heads/master deleted file mode 100644 --- a/lib/chameleon/.git/logs/refs/heads/master +++ /dev/null @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 559ab649c979fa77467982b5feb254b665f92950 mattip 1577804602 +0200 clone: from https://github.com/malthe/chameleon.git diff --git a/lib/chameleon/.git/logs/refs/remotes/origin/HEAD b/lib/chameleon/.git/logs/refs/remotes/origin/HEAD deleted file mode 100644 --- a/lib/chameleon/.git/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 559ab649c979fa77467982b5feb254b665f92950 mattip 1577804602 +0200 clone: from https://github.com/malthe/chameleon.git diff --git a/lib/chameleon/.git/objects/pack/pack-3a33d60ede72fabfdc2df4a039559e5f5740948c.idx b/lib/chameleon/.git/objects/pack/pack-3a33d60ede72fabfdc2df4a039559e5f5740948c.idx deleted file mode 100644 index 1a05e34e4585a9277314274e95ec73ecc917f56e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 GIT binary patch [cut] diff --git a/lib/chameleon/.git/objects/pack/pack-3a33d60ede72fabfdc2df4a039559e5f5740948c.pack b/lib/chameleon/.git/objects/pack/pack-3a33d60ede72fabfdc2df4a039559e5f5740948c.pack deleted file mode 100644 index 8a18da6ea0db9d7801f12d265d6eb77638db72b5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 GIT binary patch [cut] diff --git a/lib/chameleon/.git/packed-refs b/lib/chameleon/.git/packed-refs deleted file mode 100644 --- a/lib/chameleon/.git/packed-refs +++ /dev/null @@ -1,169 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -95c31f9ac136722f5ba0e16a6104e5180bd75fe4 refs/remotes/origin/1.3 -838fab8085ff4e4f741c27dec3c153b84f392bd9 refs/remotes/origin/allow-html5-data-attribute-as-contrl-prefix -aaaac4ee2aa20697740e26f9111490576f299ea0 refs/remotes/origin/fix-dollar-escape-at-end-of-string -559ab649c979fa77467982b5feb254b665f92950 refs/remotes/origin/master -9e299f4b4af7e38c3b0d4cec081d3f7adcf0bc66 refs/tags/2.0 -^440246a268791d8260bf95a630f194bc25bd2b20 -cd097e38679c0f872f3564803f81538480ea94aa refs/tags/2.0-rc1 -^f8626f626b5fc65cc8b2c3aff6b4bb940ad91a5f -4bfda45916d94ac665d96a027b3108fc6b7a1ac7 refs/tags/2.0-rc10 -^a21f6bde03d0a4a79dd8ac1b2a7ae05a3fe21e08 -313ab83b406fab82f796d72bc7814a5859bf7af7 refs/tags/2.0-rc11 -^1a91be02e4c9aa435c51da72f7874a6e24051617 -fb8c2fad2e62002904bf80f038fd1311abe6d54a refs/tags/2.0-rc12 -^f956817fa4a060ea694562fc8cdbfeb40eae04c5 -a40685bee1ad15d7aa8275da47ed6886fb098fe3 refs/tags/2.0-rc13 -^bc8d121c941fea419465941fef6805899e6861a4 -60004328a6e1d17927a00e346646205eb881e729 refs/tags/2.0-rc14 -^9fbb2ab5a923ad27bcad6b445575c2d018402862 -9668391f2e4e699d838f7ccd5aa804b113102445 refs/tags/2.0-rc2 -^3737f9850741531056c460d8acf572e8f035c833 -98f0791d11cadd3e423d45d6d65d15e100dcaa9f refs/tags/2.0-rc3 -^9c8adee93480a77f063a2a8afb1c7317e6a76a96 -b487d7277abf0b0fb0fad0514f7b64d1820f5486 refs/tags/2.0-rc4 -^27c33b96788a28190348191eead1a1fa7c9c17d9 -0c2d2709f2247d1424045014af61033f85f533c7 refs/tags/2.0-rc5 -^bdc4389ef54d34b9705345f46d28100fe27ec14d -713f3673fb605449b06f12f08f03893f1f9ec405 refs/tags/2.0-rc6 -^d120c5ed56e1e5f13b0b9a2ed5c42c2e0d6328f7 -913f2ee0a1c0b18e7c1381038266dfd0428a705a refs/tags/2.0-rc7 -^d03f4762259074bc50c138a8b4d26092f2285d9c -57f261ec57b9175491e2a8c4764c3c6d261a5c6e refs/tags/2.0-rc8 -^050c0c6335c0e07b9bfa3a6804effd7a6b6deb03 -a30c384497d00ab35a39a5d35f8b99487cc1ec94 refs/tags/2.0-rc9 -^4afe30ade113ad3b06a9ce6990469f00cf6e954a -116463e81292bd9df39a0452057188778d5d293b refs/tags/2.0.1 -^ab254f3a4b0bc4af6e180c276bd8b6e337db61c9 -8ee930bdbaa939da061719ccdfa13a3f46e36807 refs/tags/2.0.2 -^9c5bb7476c9225f95cc5ab5f6ebaf000926977ec -5d1821b82d086842ded6ba920a9ce9103d3b4777 refs/tags/2.1 -^b17b2dc1164564f5dc4d910ba9d82d8bd619d252 -0eed0c29636ad4e718f4e4ec56b669205fca1070 refs/tags/2.1.1 -^164898adb18b97fbfcb29b8c507d0233828f3181 -269ff35b2aa02f6d9dda6faae9eab7ccc2574f76 refs/tags/2.10 -^bf798ce808f618a1e0a337dbf0eba71e4d240104 -8f38725b65c99821d20c6336da8b692a9b6163ad refs/tags/2.11 -^b3d50ac45ef36b12aaa3e14083ee60a2dc2301db -ce7de4938759d847ac0ec208123941e16728e838 refs/tags/2.12 -^6d3ab682e9177cb14326806f4d7454dae3b55606 -e8472645d1be24d4e9a7a7a86826dfb4b212badc refs/tags/2.13 -^3355057b70021afc454cc2317f7db5f1b2347e3b -d2f66bddee3d7cb7c9fb002d2a811178eb79f5b2 refs/tags/2.13-1 -^b6c2a243d85eacfd4daca692142d5068a7dcf35b -0f753f1df3b3164ecc5c81e65f244ed5724dfd95 refs/tags/2.14 -^b2747539e76e5e35c2c5d2c5dfceb9abd2713817 -c54597c5a409199be6ec1bf63f186eeefbc03b30 refs/tags/2.15 -^3ae95a3d6d00dfa91e9789f840b7968293db711a -b11abb37d2760a4024f91d3b3973106a251fd60f refs/tags/2.16 -^7652686e721b8439be2b3d1357905cb09da203bf -a67ed8cf70c5e77c5b17d6cd37cf616ee92e571f refs/tags/2.17 -^64dc123da27d2c93c2f332ee66563190356a78c3 -4bb69fd43d046f903d522f319404ea7c2ce4c6fd refs/tags/2.18 -^da76c633c8236fba4010e1aabde3bf812ac5417f -44289cfe93890e903e2a3ed023474106603b6a1b refs/tags/2.19 -^91d356b25be0875fa2b72278a8a7a2c237280f0c -5f2e933460d8e7eb0249b860c1f21d4f75db9570 refs/tags/2.2 -^a1c159cb28fcecd89f865eecd411343fd3198923 -55fa99c883bf82ffb505a41eb32616d3f6018aed refs/tags/2.20 -^2473195f4f5326d6349bc64a9aaa46003f343cc3 -00c9f050ca19fd2ecbd366669ae134a910a6d24d refs/tags/2.21 -^8fdcd55dca30ddfbd0bb16b7636be93d0ad40861 -04a6e480598cfe5a6faa1109c7802ce2e7c0be5d refs/tags/2.22 -^07b1566d1eab0c333727a0371f66da0f875c25d2 -eadedf132ef90d984f4da5e83ed08509ffa2d475 refs/tags/2.23 -^65ad56d82c0716a59987475125bdaa676478d3fb -6a231e14c07ea5232d975b47c9d06fbc6df44e20 refs/tags/2.24 -^7326b8a13393a89ab8a6428f57e0d67bd6bc3e9b -f211ce07a4d1c18946a4f5b241708d6089438377 refs/tags/2.25 -^c1f4159d28dd00e08c0e1217c39ec9f01c1a1776 -d6cbcb6b739901a48b5c8a9c9ce8802c9425709d refs/tags/2.3 -^84016ef8323c4ce03517f24771b4c08466d53e40 -dcc96e9b0a02d6e4f67bc4a76ab273df569633e1 refs/tags/2.3.1 -^89b009f925c68f84a0ff62360c371b7d7bd869a1 -922804fdea269b7ed1879d0f908d356163485c28 refs/tags/2.3.2 -^11783a217dd322ab8c023cec192104d23cf634fa -006aa646b13f6bc663acf50d7bbca5709af23de9 refs/tags/2.3.3 -^f445d340f41dc2069034fa0fccbe1ecbff382631 -2a985fcb595964c791198e9b3217fba0976402dd refs/tags/2.3.4 -^607bee18c06b7e7898a8181fd3578d4fe3e89fab -650c0f8f879e97480515c8f6551e45d7a5199b51 refs/tags/2.3.5 -^9b087438795473ddabf878e84b67945a99d0f714 -2da784b626bc196da4b1c445683bfaccd9e7a942 refs/tags/2.3.6 -^af6684237baee47c3cc760d99fba3c3a4726e713 -f701ff06c05925a6076a1271bb8f16d4e7eafaa5 refs/tags/2.3.7 -^702184ea0ea4c986100c2381497e90c67d881710 -c0e625d8f65644e9bdf124bda3d8960bb84e75cc refs/tags/2.3.8 -^f007a40a77d41e952965c68fd97d3f992f1c653b -a072aa7578816583a799f59444a1eccc08e63159 refs/tags/2.4.0 -^789548751193158bd13b089053fa73afc6c5e487 -5fe744a6df9ac5b8cd6326059021232f738c78bc refs/tags/2.4.1 -^1d73a1d47c97b38e13380c8dcc2f57d55939fab0 -7856dee6dee2e462b53833388d49638de88b4960 refs/tags/2.4.2 -^943d4c61fb21c4fa48dd760fe9ff5eac6266a147 -0112d33d4a5593057fd94ee59b4050b31534a143 refs/tags/2.4.3 -^3c86ee1e6752c308a346bec17588f2fbb26251b9 -42ac6bd0f92c04d608dc5b8f86ec99672374ffc7 refs/tags/2.4.4 -^1ecbc7f6c30a0b29e1bcd6a48a985683922305d3 -ba9c751b3eee765ea4359c6ad1a75be98e2bac1d refs/tags/2.4.5 -^98363a1db489b11b4ec33dec61fe75fa478c6122 -4d87f43af187bbd4bfa0fb1bdd801145a23a3628 refs/tags/2.4.6 -^55b5fe905ea07694acd15c309cebd78dd2ddba41 -8500d255f022736710f9b7588caad3bc163d22d3 refs/tags/2.5.0 -^58fb4f80d3bac730ae3c664bdf83dcbad497445e -1a29ad86573fc95e2dbf2e23df75fb7259517558 refs/tags/2.5.1 -^619bf1fea11f61d0126d261fb53b1a121302ff46 -9abbf0c285ee9667ad66ca6472fb23be0634ca2e refs/tags/2.5.2 -^9af921665e9f8e2276c132728742a6c504ecd6ca -4c8a633bd10857e4db104a58b2c42e434b9243a4 refs/tags/2.5.3 -^8eca09d543f43c5edb41c5c25e6cd9bbe93992ed -c40073ae6924fd2fecbdcd092e914ba7bea09473 refs/tags/2.6.0 -^3386c26a4d9169815ad19b4cbe7fb04e6d3fd554 -911df611ac669112a462e52b33ed2f3eef07f383 refs/tags/2.6.1 -^bf34fd136237c5d724093758e9b418e61c47f806 -e9d6d40f7d70fea8d28aac339c4f97ea2f09ab90 refs/tags/2.6.2 -^dd6415f33a2efc62c8f1860740606d60d2d0f7ef -408074c6fc6c7df06499bb11a9f1735f54a48192 refs/tags/2.7.0 -^73723372a5a25c466425328a28a2cceb11e6104b -6995b1438841847d95bd616bdd533cdaa99a533e refs/tags/2.7.1 -^7074855da37eaedf4523b561d8373cefbf8e1270 -96c87855a70e0f01fa65c3ddaa83a3aadb77bf03 refs/tags/2.7.2 -^7147545d9d867522b6ad1580d6ecfb3f0d68c8f0 -608b6095732c0553ab607cbcd5d2289810aea4e7 refs/tags/2.7.3 -^e5a386587cbbe83e1f9a18130b0da9998774a244 -77a54c30688ec7157deef6dab2587d9056cf5ea1 refs/tags/2.7.4 -^631e3131a94468436dc8f581a068ece46e119be5 -c90af00b69cd9420da70360f8dfe85a8b55780b6 refs/tags/2.8.0 -^0d5e6ee1d24314d369cb952d814b9e7dfcdde40f -66905936b0435a1f14af92a513c700dc33e9af82 refs/tags/2.8.1 -^0c2a4497c7da50efcb54963c18492c8057ee9748 -e61b693773b2184435eea6c0636c022e792fc08d refs/tags/2.8.2 -^d3cb822dcf0983a55c9edcf547e72bf698a8e63b -a937d7e7230803804ec9fbda87751864c166585b refs/tags/2.8.3 -^26d5ac892a141c238f87c8e71b455e0e1d529d19 -51ae8757aee1dc54bab1ce985911837332c4019e refs/tags/2.8.4 -^f625708f40a1b0f7ab8fed561cc5a68090065645 -9f80e9a9133d61863fce9df7df4357fd8b9ab772 refs/tags/2.8.5 -^58ef63dfbd4d1b1fc874f10e16a7f30c2fe63555 -b22aee05cc2b9567cb1fac82c1f8dedb27a61a98 refs/tags/2.9.0 -^76bebbb82a8eb002c80143bfaa2ac57a0f2c388b -a76fd09520f58b5ca43d905b17548f55ea36dca7 refs/tags/2.9.1 -^bbfce8555f4af8c0e220efcc66805f66e10ff544 -659e060549b56a8d10d5e4230e550a875ba70ffa refs/tags/2.9.2 -^fe730e478b0f87e90bc38c2de9270849fda9c384 -f28a4ee980fb409d710104bb1d28ea26ecf1ca23 refs/tags/3.0 -^c47ea64b8e167050d017c913d4d4a28916d4ad8d -3a317c05505b9541362441d73dae6b9f50f59d92 refs/tags/3.1 -^12b3b6a44fa8a5b49ad0d63e0f21e59c75789a37 -24c360de8005e8b626a797689a5d42463c3730e3 refs/tags/3.2 -^78628c5027430c8d7d437845588bcc02aacfd1fc -98374bb6b982f53051975c02ae56dad048004914 refs/tags/3.3 -ebebf78e3feced96168ea927f08e908a838eb580 refs/tags/3.4 -eddaa33ac0428ae81bd9b163bed02f79a3a78116 refs/tags/3.5 -^9c1d8003f5409d4de6bf6d38446491383c6f2d5f -87a6dc321695c314bacdadc308a7f09d5c0898cc refs/tags/3.6 -^7da66acfa1b8a3479e800747f3f8ad6e469d24f9 -f91105a48715b8fffefc01cf632a4daad4c50b36 refs/tags/3.6.1 -^6d515df8e03051268df2cb635d415fa5b7f012c2 -aa9d5d1cd20ededeeae963532fe7bf5a03256517 refs/tags/3.6.2 -^f540da3de0033c0dac9853668ea193c333db49ac diff --git a/lib/chameleon/.git/refs/heads/master b/lib/chameleon/.git/refs/heads/master deleted file mode 100644 --- a/lib/chameleon/.git/refs/heads/master +++ /dev/null @@ -1,1 +0,0 @@ -559ab649c979fa77467982b5feb254b665f92950 diff --git a/lib/chameleon/.git/refs/remotes/origin/HEAD b/lib/chameleon/.git/refs/remotes/origin/HEAD deleted file mode 100644 --- a/lib/chameleon/.git/refs/remotes/origin/HEAD +++ /dev/null @@ -1,1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/lib/chameleon/src/chameleon/tests/outputs/001.html b/lib/chameleon/src/chameleon/tests/outputs/001.html deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/001.html +++ /dev/null @@ -1,7 +0,0 @@ - - - Hello world! - Hello world! - - Goodbye world! - diff --git a/lib/chameleon/src/chameleon/tests/outputs/001.pt b/lib/chameleon/src/chameleon/tests/outputs/001.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/001.pt +++ /dev/null @@ -1,9 +0,0 @@ - - - Hello world! - - - - ok - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/001.txt b/lib/chameleon/src/chameleon/tests/outputs/001.txt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/001.txt +++ /dev/null @@ -1,1 +0,0 @@ -<&> diff --git a/lib/chameleon/src/chameleon/tests/outputs/002.pt b/lib/chameleon/src/chameleon/tests/outputs/002.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/002.pt +++ /dev/null @@ -1,13 +0,0 @@ - - -
- Hello! - Hello. -
-
- Goodbye! - Goodbye. -
- ok - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/003.pt b/lib/chameleon/src/chameleon/tests/outputs/003.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/003.pt +++ /dev/null @@ -1,17 +0,0 @@ - - -
Hello world!
-
Hello world!
1 - 2
Hello world!
-
Hello world!
3 -
Hello world!
5 - 6
Hello world!
-
1
-
1.0
-
True
-
False
-
0
-
- <div>Hello world!</div> - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/004.pt b/lib/chameleon/src/chameleon/tests/outputs/004.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/004.pt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/005.pt b/lib/chameleon/src/chameleon/tests/outputs/005.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/005.pt +++ /dev/null @@ -1,12 +0,0 @@ - - - - - Default - True - False - - Computed default - - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/006.pt b/lib/chameleon/src/chameleon/tests/outputs/006.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/006.pt +++ /dev/null @@ -1,9 +0,0 @@ - - - copyright (c) 2010 - copyright (c) 2010 - copyright (c) 2010 - $ignored - <type 'str'> - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/007.pt b/lib/chameleon/src/chameleon/tests/outputs/007.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/007.pt +++ /dev/null @@ -1,20 +0,0 @@ - - - Hello world! -
Hello world!
-
Hello world!
- <type 'str'> - && - - - Hello world - $leftalone -
-
Hello world
-
${} is ignored.
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/008.pt b/lib/chameleon/src/chameleon/tests/outputs/008.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/008.pt +++ /dev/null @@ -1,12 +0,0 @@ - - - {} - -
- static -
-
- nothing -
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/009.pt b/lib/chameleon/src/chameleon/tests/outputs/009.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/009.pt +++ /dev/null @@ -1,5 +0,0 @@ - - -
Hello world!
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/010.pt b/lib/chameleon/src/chameleon/tests/outputs/010.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/010.pt +++ /dev/null @@ -1,9 +0,0 @@ - - -
1 < 2
-
2 < 3, 2&3, 2<3, 2>3
-
3 < 4
-
4 < 5
-
Hello world!
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/011-en.pt b/lib/chameleon/src/chameleon/tests/outputs/011-en.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/011-en.pt +++ /dev/null @@ -1,9 +0,0 @@ - - -
Message ('message' translation into 'en')
-
Message ('message' translation into 'en')
-
Message ('message' translation into 'en')
-
Message ('message' translation into 'en')
- Message ('message' translation into 'en') - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/011.pt b/lib/chameleon/src/chameleon/tests/outputs/011.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/011.pt +++ /dev/null @@ -1,9 +0,0 @@ - - -
Message
-
Message
-
Message
-
Message
- Message - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/012-en.pt b/lib/chameleon/src/chameleon/tests/outputs/012-en.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/012-en.pt +++ /dev/null @@ -1,10 +0,0 @@ - - -
-
Hello world! ('Hello world!' translation into 'en')
-
Hello world! ('hello_world' translation into 'en')
-
Hello world! ('Hello world!' translation into 'en')
-
Hello world! Goodbye planet! ('Hello ${first}! Goodbye ${second}!' translation into 'en')
-
Hello world! Goodbye planet! ('hello_goodbye' translation into 'en')
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/012.pt b/lib/chameleon/src/chameleon/tests/outputs/012.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/012.pt +++ /dev/null @@ -1,10 +0,0 @@ - - -
-
Hello world!
-
Hello world!
-
Hello world!
-
Hello world! Goodbye planet!
-
Hello world! Goodbye planet!
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/013.pt b/lib/chameleon/src/chameleon/tests/outputs/013.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/013.pt +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - -
- [1,1] - - [1,2] -
- [2,1] - - [2,2] -
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/014.pt b/lib/chameleon/src/chameleon/tests/outputs/014.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/014.pt +++ /dev/null @@ -1,12 +0,0 @@ - - - - [3,3] - [3,4] - - - [4,3] - [4,4] - - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/015-en.pt b/lib/chameleon/src/chameleon/tests/outputs/015-en.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/015-en.pt +++ /dev/null @@ -1,5 +0,0 @@ - - -
Price: Per kilo 12.5 ('Per kilo ${amount}' translation into 'en') ('Price: ${price}' translation into 'en')
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/015.pt b/lib/chameleon/src/chameleon/tests/outputs/015.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/015.pt +++ /dev/null @@ -1,5 +0,0 @@ - - -
Price: Per kilo 12.5
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/016-en.pt b/lib/chameleon/src/chameleon/tests/outputs/016-en.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/016-en.pt +++ /dev/null @@ -1,9 +0,0 @@ - - -
Hello world! ('Hello world!' translation into 'en')
- Hello world! ('Hello world!' translation into 'en') - Hello world! ('hello_world' translation into 'en') - Hello world! ('Hello world!' translation into 'en') - Hello world! ('hello_world' translation into 'en') - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/016.pt b/lib/chameleon/src/chameleon/tests/outputs/016.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/016.pt +++ /dev/null @@ -1,9 +0,0 @@ - - -
Hello world!
- Hello world! - Hello world! - Hello world! - Hello world! - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/017.pt b/lib/chameleon/src/chameleon/tests/outputs/017.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/017.pt +++ /dev/null @@ -1,12 +0,0 @@ - - - Hello world! - 1 - Hello world! - 23 - 4Hello world! -
Hello world!
- Hello world! - Hello world! - - \ No newline at end of file diff --git a/lib/chameleon/src/chameleon/tests/outputs/018-en.pt b/lib/chameleon/src/chameleon/tests/outputs/018-en.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/018-en.pt +++ /dev/null @@ -1,3 +0,0 @@ -
- october ('october' translation into 'en') 1982 ('1982' translation into 'en') ('${monthname} ${year}' translation into 'en') -
diff --git a/lib/chameleon/src/chameleon/tests/outputs/018.pt b/lib/chameleon/src/chameleon/tests/outputs/018.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/018.pt +++ /dev/null @@ -1,3 +0,0 @@ -
- october 1982 -
diff --git a/lib/chameleon/src/chameleon/tests/outputs/019.pt b/lib/chameleon/src/chameleon/tests/outputs/019.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/019.pt +++ /dev/null @@ -1,13 +0,0 @@ - - - Hello world! - Hello world!1 - 2Hello world! - Hello world!3 - Hello world!5 - 6Hello world! - 1 - 1.0 - True - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/020.pt b/lib/chameleon/src/chameleon/tests/outputs/020.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/020.pt +++ /dev/null @@ -1,8 +0,0 @@ - - -
-
NameError thrown at 5:24.
-
-
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/021-en.pt b/lib/chameleon/src/chameleon/tests/outputs/021-en.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/021-en.pt +++ /dev/null @@ -1,12 +0,0 @@ - - -
Hello world! ('Hello world!' translation into 'en' with domain 'new')
-
Hello world! ('Hello world!' translation into 'en' with domain 'old')
-
- Hello world! -
-
- Hello world! -
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/021.pt b/lib/chameleon/src/chameleon/tests/outputs/021.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/021.pt +++ /dev/null @@ -1,12 +0,0 @@ - - -
Hello world!
-
Hello world!
-
- Hello world! -
-
- Hello world! -
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/022.pt b/lib/chameleon/src/chameleon/tests/outputs/022.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/022.pt +++ /dev/null @@ -1,21 +0,0 @@ - - -
- - ok - - - - ok -
-
- - ok -
-
- - - ok -
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/023.pt b/lib/chameleon/src/chameleon/tests/outputs/023.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/023.pt +++ /dev/null @@ -1,6 +0,0 @@ - - - - ok - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/024.pt b/lib/chameleon/src/chameleon/tests/outputs/024.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/024.pt +++ /dev/null @@ -1,14 +0,0 @@ - - - - - first - - second - - - ok - - - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/025.pt b/lib/chameleon/src/chameleon/tests/outputs/025.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/025.pt +++ /dev/null @@ -1,22 +0,0 @@ - - -
    -
  • 1
    • -
  • 2
    • -
  • 3
    • -
  • 1
  • 2
  • 3
    • -
  • 1
    • -
  • 2
    • -
  • 3
    • - - - 1, - - 2, - - 3 - - . -
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/026.pt b/lib/chameleon/src/chameleon/tests/outputs/026.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/026.pt +++ /dev/null @@ -1,17 +0,0 @@ -
-
    -
  • 0
    • -
  • 1
    • -
  • 2
    • -
-
    -
  • 0
    • -
  • 1
    • -
  • 2
    • -
-
    -
  • even
    • -
  • odd
    • -
  • even
    • -
-
diff --git a/lib/chameleon/src/chameleon/tests/outputs/027.pt b/lib/chameleon/src/chameleon/tests/outputs/027.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/027.pt +++ /dev/null @@ -1,7 +0,0 @@ -
- abcghi - Hello World! - Hello World! -
diff --git a/lib/chameleon/src/chameleon/tests/outputs/028.pt b/lib/chameleon/src/chameleon/tests/outputs/028.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/028.pt +++ /dev/null @@ -1,5 +0,0 @@ -
- - - -
diff --git a/lib/chameleon/src/chameleon/tests/outputs/029.pt b/lib/chameleon/src/chameleon/tests/outputs/029.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/029.pt +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/lib/chameleon/src/chameleon/tests/outputs/030.pt b/lib/chameleon/src/chameleon/tests/outputs/030.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/030.pt +++ /dev/null @@ -1,10 +0,0 @@ - - -
- 1, 1, 2 -
-
- 2, 3, 4 -
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/031.pt b/lib/chameleon/src/chameleon/tests/outputs/031.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/031.pt +++ /dev/null @@ -1,7 +0,0 @@ -
- Hello World! - Hello World! - Hello World! - 012 - True -
diff --git a/lib/chameleon/src/chameleon/tests/outputs/032.pt b/lib/chameleon/src/chameleon/tests/outputs/032.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/032.pt +++ /dev/null @@ -1,15 +0,0 @@ - - - Master template - - -
- - - -
- - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/033.pt b/lib/chameleon/src/chameleon/tests/outputs/033.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/033.pt +++ /dev/null @@ -1,15 +0,0 @@ - - - Master template - - -
- - - -
- - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/034.pt b/lib/chameleon/src/chameleon/tests/outputs/034.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/034.pt +++ /dev/null @@ -1,15 +0,0 @@ - - - Master template - - -
- - - -
- - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/035.pt b/lib/chameleon/src/chameleon/tests/outputs/035.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/035.pt +++ /dev/null @@ -1,17 +0,0 @@ - - - - New title - - - -
- - - -
- - - \ No newline at end of file diff --git a/lib/chameleon/src/chameleon/tests/outputs/036.pt b/lib/chameleon/src/chameleon/tests/outputs/036.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/036.pt +++ /dev/null @@ -1,15 +0,0 @@ - - - New title - - -
- - - -
- - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/037.pt b/lib/chameleon/src/chameleon/tests/outputs/037.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/037.pt +++ /dev/null @@ -1,15 +0,0 @@ - - - Master template - - -
- - ok - -
- - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/038.pt b/lib/chameleon/src/chameleon/tests/outputs/038.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/038.pt +++ /dev/null @@ -1,6 +0,0 @@ - - - - ok - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/039.pt b/lib/chameleon/src/chameleon/tests/outputs/039.pt deleted file mode 100644 diff --git a/lib/chameleon/src/chameleon/tests/outputs/040.pt b/lib/chameleon/src/chameleon/tests/outputs/040.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/040.pt +++ /dev/null @@ -1,15 +0,0 @@ - - - - - foo - - - - - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/041.pt b/lib/chameleon/src/chameleon/tests/outputs/041.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/041.pt +++ /dev/null @@ -1,7 +0,0 @@ - - -
Hello world!
-
Hello world!
-
Goodbye
- - diff --git a/lib/chameleon/src/chameleon/tests/outputs/042.pt b/lib/chameleon/src/chameleon/tests/outputs/042.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/042.pt +++ /dev/null @@ -1,15 +0,0 @@ - - - Master template - - -
- - - -
- - - \ No newline at end of file diff --git a/lib/chameleon/src/chameleon/tests/outputs/043.pt b/lib/chameleon/src/chameleon/tests/outputs/043.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/043.pt +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - My title - - - - \ No newline at end of file diff --git a/lib/chameleon/src/chameleon/tests/outputs/044.pt b/lib/chameleon/src/chameleon/tests/outputs/044.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/044.pt +++ /dev/null @@ -1,5 +0,0 @@ - - - a, b - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/045.pt b/lib/chameleon/src/chameleon/tests/outputs/045.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/045.pt +++ /dev/null @@ -1,12 +0,0 @@ - - -]> - - - ZZZ YYY XXX - - diff --git a/lib/chameleon/src/chameleon/tests/outputs/046.pt b/lib/chameleon/src/chameleon/tests/outputs/046.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/046.pt +++ /dev/null @@ -1,17 +0,0 @@ - - - Master template - - -
- - - -
- - - \ No newline at end of file diff --git a/lib/chameleon/src/chameleon/tests/outputs/047.pt b/lib/chameleon/src/chameleon/tests/outputs/047.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/047.pt +++ /dev/null @@ -1,17 +0,0 @@ - - - Master template - - -
- - - -
- - - \ No newline at end of file diff --git a/lib/chameleon/src/chameleon/tests/outputs/048.pt b/lib/chameleon/src/chameleon/tests/outputs/048.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/048.pt +++ /dev/null @@ -1,17 +0,0 @@ - - - Master template - - -
- - - -
- - - \ No newline at end of file diff --git a/lib/chameleon/src/chameleon/tests/outputs/049.pt b/lib/chameleon/src/chameleon/tests/outputs/049.pt deleted file mode 100644 --- a/lib/chameleon/src/chameleon/tests/outputs/049.pt +++ /dev/null @@ -1,11 +0,0 @@ - - - 
amp=&amp; lt=&lt;
- 
amp=& lt=<
- + + diff --git a/public/assets/css/_styles.css b/public/assets/css/_styles.css new file mode 100644 --- /dev/null +++ b/public/assets/css/_styles.css @@ -0,0 +1,1388 @@ +/*! sanitize.css v8.0.0 | CC0 License | github.com/csstools/sanitize.css */ +*, +::before, +::after { + background-repeat: no-repeat; + box-sizing: border-box; } + +::before, +::after { + text-decoration: inherit; + vertical-align: inherit; } + +html { + cursor: default; + font-family: system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + line-height: 1.15; + -moz-tab-size: 4; + tab-size: 4; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; + word-break: break-word; } + +body { + margin: 0; } + +h1 { + font-size: 2em; + margin: 0.67em 0; } + +hr { + height: 0; + overflow: visible; } + +main { + display: block; } + +nav ol, +nav ul { + list-style: none; } + +pre { + font-family: Menlo, Consolas, Roboto Mono, Ubuntu Monospace, Noto Mono, Oxygen Mono, Liberation Mono, monospace; + font-size: 1em; } + +a { + background-color: transparent; } + +abbr[title] { + text-decoration: underline; + text-decoration: underline dotted; } + +b, +strong { + font-weight: bolder; } + +code, +kbd, +samp { + font-family: Menlo, Consolas, Roboto Mono, Ubuntu Monospace, Noto Mono, Oxygen Mono, Liberation Mono, monospace; + font-size: 1em; } + +small { + font-size: 80%; } + +::-moz-selection { + background-color: #b3d4fc; + color: #000; + text-shadow: none; } + +::selection { + background-color: #b3d4fc; + color: #000; + text-shadow: none; } + +audio, +canvas, +iframe, +img, +svg, +video { + vertical-align: middle; } + +audio, +video { + display: inline-block; } + +audio:not([controls]) { + display: none; + height: 0; } + +img { + border-style: none; } + +svg:not([fill]) { + fill: currentColor; } + +svg:not(:root) { + overflow: hidden; } + +table { + border-collapse: collapse; } + +button, +input, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; } + +button, +input, +select { + margin: 0; } + +button { + overflow: visible; + text-transform: none; } + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; } + +fieldset { + padding: 0.35em 0.75em 0.625em; } + +input { + overflow: visible; } + +legend { + color: inherit; + display: table; + max-width: 100%; + white-space: normal; } + +progress { + display: inline-block; + vertical-align: baseline; } + +select { + text-transform: none; } + +textarea { + margin: 0; + overflow: auto; + resize: vertical; } + +[type="checkbox"], +[type="radio"] { + padding: 0; } + +[type="search"] { + -webkit-appearance: textfield; + outline-offset: -2px; } + +::-webkit-inner-spin-button, +::-webkit-outer-spin-button { + height: auto; } + +::-webkit-input-placeholder { + color: inherit; + opacity: 0.54; } + +::-webkit-search-decoration { + -webkit-appearance: none; } + +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit; } + +::-moz-focus-inner { + border-style: none; + padding: 0; } + +:-moz-focusring { + outline: 1px dotted ButtonText; } + +details { + display: block; } + +dialog { + background-color: white; + border: solid; + color: black; + display: block; + height: -moz-fit-content; + height: -webkit-fit-content; + height: fit-content; + left: 0; + margin: auto; + padding: 1em; + position: absolute; + right: 0; + width: -moz-fit-content; + width: -webkit-fit-content; + width: fit-content; } + +dialog:not([open]) { + display: none; } + +summary { + display: list-item; } + +canvas { + display: inline-block; } + +template { + display: none; } + +a, +area, +button, +input, +label, +select, +summary, +textarea, +[tabindex] { + -ms-touch-action: manipulation; + touch-action: manipulation; } + +[hidden] { + display: none; } + +[aria-busy="true"] { + cursor: progress; } + +[aria-controls] { + cursor: pointer; } + +[aria-disabled="true"], +[disabled] { + cursor: not-allowed; } + +[aria-hidden="false"][hidden]:not(:focus) { + clip: rect(0, 0, 0, 0); + display: inherit; + position: absolute; } + +/*! Based on https://github.com/milligram/milligram */ +*, +*:after, +*:before { + box-sizing: inherit; } + +html { + box-sizing: border-box; + font-size: 62.5%; } + +body { + font-size: 1.6em; + font-weight: 300; + letter-spacing: .01em; + line-height: 1.6; + background-color: #fcfcfc; } + +body { + color: #4B545C; + font-family: 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif; } + +b, +strong { + font-weight: bold; } + +p { + margin-top: 0; } + +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: 300; + letter-spacing: -.1rem; + margin-bottom: 2.0rem; + margin-top: 0; } + +h1 { + font-size: 4.6rem; + line-height: 1.2; } + +h2 { + font-size: 3.6rem; + line-height: 1.25; } + +h3 { + font-size: 2.8rem; + line-height: 1.3; } + +h4 { + font-size: 2.2rem; + letter-spacing: -.08rem; + line-height: 1.35; } + +h5 { + font-size: 1.8rem; + letter-spacing: -.05rem; + line-height: 1.5; } + +h6 { + font-size: 1.6rem; + letter-spacing: 0; + line-height: 1.4; } + +blockquote { + border-left: 0.3rem solid #d1d1d1; + margin-left: 0; + margin-right: 0; + padding: 1rem 1.5rem; } + blockquote *:last-child { + margin-bottom: 0; } + +.button, +button { + background-color: #35bf712e; + border: 0.1rem solid #1890ff; + border-radius: .4rem; + color: #fcfcfc; + cursor: pointer; + display: inline-block; + font-size: 1.1rem; + font-weight: 700; + height: 3.8rem; + letter-spacing: .1rem; + line-height: 3.8rem; + padding: 0 3.0rem; + text-align: center; + text-decoration: none; + text-transform: uppercase; + white-space: nowrap; + -webkit-box-shadow: 0px 5px 10px 0px rgba(24, 144, 255, 0.2); + -webkit-box-shadow--moz-box-shadow: 0px 5px 10px 0px rgba(24, 144, 255, 0.2); + -webkit-box-shadow-box-shadow: 0px 5px 10px 0px rgba(24, 144, 255, 0.2); } + .button:focus, .button:hover, + button:focus, + button:hover, + input[type='button']:focus, + input[type='button']:hover, + input[type='reset']:focus, + input[type='reset']:hover, + input[type='submit']:focus, + input[type='submit']:hover { + background-color: #4B545C; + border-color: #4B545C; + color: #fcfcfc; + outline: 0; + -webkit-box-shadow: 0px 5px 10px 0px rgba(75, 84, 92, 0.2); + -webkit-box-shadow--moz-box-shadow: 0px 5px 10px 0px rgba(75, 84, 92, 0.2); + -webkit-box-shadow-box-shadow: 0px 5px 10px 0px rgba(75, 84, 92, 0.2); } + .button[disabled], + button[disabled], + input[type='button'][disabled], + input[type='reset'][disabled], + input[type='submit'][disabled] { + cursor: default; + opacity: .5; } + .button[disabled]:focus, .button[disabled]:hover, + button[disabled]:focus, + button[disabled]:hover, + input[type='button'][disabled]:focus, + input[type='button'][disabled]:hover, + input[type='reset'][disabled]:focus, + input[type='reset'][disabled]:hover, + input[type='submit'][disabled]:focus, + input[type='submit'][disabled]:hover { + background-color: #35bf712e; + border-color: #1890ff; } + .button.button-outline, + button.button-outline, + input[type='button'].button-outline, + input[type='reset'].button-outline, + input[type='submit'].button-outline { + background-color: transparent; + color: #35bf712e; } + .button.button-outline:focus, .button.button-outline:hover, + button.button-outline:focus, + button.button-outline:hover, + input[type='button'].button-outline:focus, + input[type='button'].button-outline:hover, + input[type='reset'].button-outline:focus, + input[type='reset'].button-outline:hover, + input[type='submit'].button-outline:focus, + input[type='submit'].button-outline:hover { + background-color: transparent; + border-color: #4B545C; + color: #4B545C; } + .button.button-outline[disabled]:focus, .button.button-outline[disabled]:hover, + button.button-outline[disabled]:focus, + button.button-outline[disabled]:hover, + input[type='button'].button-outline[disabled]:focus, + input[type='button'].button-outline[disabled]:hover, + input[type='reset'].button-outline[disabled]:focus, + input[type='reset'].button-outline[disabled]:hover, + input[type='submit'].button-outline[disabled]:focus, + input[type='submit'].button-outline[disabled]:hover { + border-color: inherit; + color: #35bf712e; } + .button.button-clear, + button.button-clear, + input[type='button'].button-clear, + input[type='reset'].button-clear, + input[type='submit'].button-clear { + background-color: transparent; + border-color: transparent; + color: #35bf712e; } + .button.button-clear:focus, .button.button-clear:hover, + button.button-clear:focus, + button.button-clear:hover, + input[type='button'].button-clear:focus, + input[type='button'].button-clear:hover, + input[type='reset'].button-clear:focus, + input[type='reset'].button-clear:hover, + input[type='submit'].button-clear:focus, + input[type='submit'].button-clear:hover { + background-color: transparent; + border-color: transparent; + color: #4B545C; } + .button.button-clear[disabled]:focus, .button.button-clear[disabled]:hover, + button.button-clear[disabled]:focus, + button.button-clear[disabled]:hover, + input[type='button'].button-clear[disabled]:focus, + input[type='button'].button-clear[disabled]:hover, + input[type='reset'].button-clear[disabled]:focus, + input[type='reset'].button-clear[disabled]:hover, + input[type='submit'].button-clear[disabled]:focus, + input[type='submit'].button-clear[disabled]:hover { + color: #35bf712e; } + +code { + background: #f4f5f6; + border-radius: .4rem; + font-size: 86%; + margin: 0 .2rem; + padding: 0.8rem 1rem; + white-space: normal; } + +pre { + border-left: 0.3rem solid #1890ff; + padding-left: 2rem; + background: #f4f5f6; + overflow-y: hidden; } + pre > code { + border-radius: 0; + display: block; + padding: 1rem 1.5rem; + white-space: pre; } + +hr { + border: 0; + border-top: 0.1rem solid #d1d1d1; + margin: 3.0rem 0; } + +:link { + color: #35bf712e; +} + +input[type='email'], +input[type='number'], +input[type='password'], +input[type='search'], +input[type='tel'], +input[type='text'], +input[type='url'], +input[type='color'], +input[type='date'], +input[type='month'], +input[type='week'], +input[type='datetime'], +input[type='datetime-local'], +input:not([type]), +textarea, +select { + -webkit-appearance: none; + -webkit-appearance--moz-appearance: none; + appearance: none; + background-color: transparent; + color: #4B545C; + border: 0.1rem solid #d1d1d1; + border-radius: .4rem; + box-shadow: none; + box-sizing: inherit; + height: 3.8rem; + padding: .6rem 1.0rem; + width: 100%; } + input[type='email']:focus, + input[type='number']:focus, + input[type='password']:focus, + input[type='search']:focus, + input[type='tel']:focus, + input[type='text']:focus, + input[type='url']:focus, + input[type='color']:focus, + input[type='date']:focus, + input[type='month']:focus, + input[type='week']:focus, + input[type='datetime']:focus, + input[type='datetime-local']:focus, + input:not([type]):focus, + textarea:focus, + select:focus { + border-color: #1890ff; + outline: 0; } + +select { + background: url('data:image/svg+xml;utf8,') center right no-repeat; + padding-right: 3.0rem; } + select:focus { + background-image: url('data:image/svg+xml;utf8,'); } + +textarea { + min-height: 6.5rem; } + +label, +legend { + display: block; + font-size: 1.6rem; + font-weight: 700; + margin-bottom: .5rem; } + +fieldset { + border-width: 0; + padding: 0; } + +input[type='checkbox'], +input[type='radio'] { + display: inline; } + +.label-inline { + display: inline-block; + font-weight: normal; + margin-left: .5rem; } + +a { + color: #1890ff; + text-decoration: none; } + a:focus, a:hover { + color: #4B545C; } + +dl, +ol, +ul { + list-style: none; + margin-top: 0; + padding-left: 3rem; } + dl dl, + dl ol, + dl ul, + ol dl, + ol ol, + ol ul, + ul dl, + ul ol, + ul ul { + font-size: 90%; + margin: 1.5rem 0 1.5rem 3.0rem; } + +ol { + list-style: decimal inside; + list-style-position: outside; } + +ul { + list-style: circle inside; + list-style-position: outside; } + +.button, +button, +dd, +dt, +li { + margin-bottom: 1.0rem; } + +fieldset, +input, +select, +textarea { + margin-bottom: 1.5rem; } + +blockquote, +dl, +figure, +form, +ol, +p, +pre, +table, +ul { + margin-bottom: 2.5rem; } + +table { + border-spacing: 0; + width: 100%; } + +td, +th { + border-bottom: 0.1rem solid #e1e1e1; + padding: 1.2rem 1.5rem; + text-align: left; } + td:first-child, + th:first-child { + padding-left: 0; } + td:last-child, + th:last-child { + padding-right: 0; } + + at media screen and (max-width: 40rem) { + table { + border-spacing: 0; + display: flex; + width: 100%; } + table thead { + border-right: solid 0.1rem #e1e1e1; } + table thead td, + table thead th { + padding-left: 0; } + table thead td:first-child, + table thead th:first-child { + padding-left: 0; } + table thead td:last-child, + table thead th:last-child { + padding-right: 1.2rem; } + table tbody { + display: flex; + overflow-x: auto; + white-space: nowrap; } + table tbody tr { + border-right: solid 0.1rem #e1e1e1; } + table tbody tr:last-child { + border-right: none; } + table td, + table th { + display: block; } + table td:first-child, + table th:first-child { + padding-left: 1.2rem; } + table td:last-child, + table th:last-child { + padding-right: 1.2rem; } } + +img { + max-width: 100%; } + +.p-0 { + padding: 0; } + +.pt-0 { + padding-top: 0; } + +.pb-0 { + padding-bottom: 0; } + +.pl-0 { + padding-left: 0; } + +.pr-0 { + padding-right: 0; } + +.py-0 { + padding-top: 0; + padding-bottom: 0; } + +.px-0 { + padding-left: 0; + padding-right: 0; } + +.p-1 { + padding: 1rem; } + +.pt-1 { + padding-top: 1rem; } + +.pb-1 { + padding-bottom: 1rem; } + +.pl-1 { + padding-left: 1rem; } + +.pr-1 { + padding-right: 1rem; } + +.py-1 { + padding-top: 1rem; + padding-bottom: 1rem; } + +.px-1 { + padding-left: 1rem; + padding-right: 1rem; } + +.p-2 { + padding: 2rem; } + +.pt-2 { + padding-top: 2rem; } + +.pb-2 { + padding-bottom: 2rem; } + +.pl-2 { + padding-left: 2rem; } + +.pr-2 { + padding-right: 2rem; } + +.py-2 { + padding-top: 2rem; + padding-bottom: 2rem; } + +.px-2 { + padding-left: 2rem; + padding-right: 2rem; } + +.p-3 { + padding: 3rem; } + +.pt-3 { + padding-top: 3rem; } + +.pb-3 { + padding-bottom: 3rem; } + +.pl-3 { + padding-left: 3rem; } + +.pr-3 { + padding-right: 3rem; } + +.py-3 { + padding-top: 3rem; + padding-bottom: 3rem; } + +.px-3 { + padding-left: 3rem; + padding-right: 3rem; } + +.p-4 { + padding: 6rem; } + +.pt-4 { + padding-top: 6rem; } + +.pb-4 { + padding-bottom: 6rem; } + +.pl-4 { + padding-left: 6rem; } + +.pr-4 { + padding-right: 6rem; } + +.py-4 { + padding-top: 6rem; + padding-bottom: 6rem; } + +.px-4 { + padding-left: 6rem; + padding-right: 6rem; } + +.p-5 { + padding: 8rem; } + +.pt-5 { + padding-top: 8rem; } + +.pb-5 { + padding-bottom: 8rem; } + +.pl-5 { + padding-left: 8rem; } + +.pr-5 { + padding-right: 8rem; } + +.py-5 { + padding-top: 8rem; + padding-bottom: 8rem; } + +.px-5 { + padding-left: 8rem; + padding-right: 8rem; } + +.m-0 { + margin: 0; } + +.mt-0 { + margin-top: 0; } + +.mb-0 { + margin-bottom: 0; } + +.ml-0 { + margin-left: 0; } + +.mr-0 { + margin-right: 0; } + +.my-0 { + margin-top: 0; + margin-bottom: 0; } + +.mx-0 { + margin-left: 0; + margin-right: 0; } + +.m-1 { + margin: 1rem; } + +.mt-1 { + margin-top: 1rem; } + +.mb-1 { + margin-bottom: 1rem; } + +.ml-1 { + margin-left: 1rem; } + +.mr-1 { + margin-right: 1rem; } + +.my-1 { + margin-top: 1rem; + margin-bottom: 1rem; } + +.mx-1 { + margin-left: 1rem; + margin-right: 1rem; } + +.m-2 { + margin: 2rem; } + +.mt-2 { + margin-top: 2rem; } + +.mb-2 { + margin-bottom: 2rem; } + +.ml-2 { + margin-left: 2rem; } + +.mr-2 { + margin-right: 2rem; } + +.my-2 { + margin-top: 2rem; + margin-bottom: 2rem; } + +.mx-2 { + margin-left: 2rem; + margin-right: 2rem; } + +.m-3 { + margin: 3rem; } + +.mt-3 { + margin-top: 3rem; } + +.mb-3 { + margin-bottom: 3rem; } + +.ml-3 { + margin-left: 3rem; } + +.mr-3 { + margin-right: 3rem; } + +.my-3 { + margin-top: 3rem; + margin-bottom: 3rem; } + +.mx-3 { + margin-left: 3rem; + margin-right: 3rem; } + +.m-4 { + margin: 6rem; } + +.mt-4 { + margin-top: 6rem; } + +.mb-4 { + margin-bottom: 6rem; } + +.ml-4 { + margin-left: 6rem; } + +.mr-4 { + margin-right: 6rem; } + +.my-4 { + margin-top: 6rem; + margin-bottom: 6rem; } + +.mx-4 { + margin-left: 6rem; + margin-right: 6rem; } + +.m-5 { + margin: 8rem; } + +.mt-5 { + margin-top: 8rem; } + +.mb-5 { + margin-bottom: 8rem; } + +.ml-5 { + margin-left: 8rem; } + +.mr-5 { + margin-right: 8rem; } + +.my-5 { + margin-top: 8rem; + margin-bottom: 8rem; } + +.mx-5 { + margin-left: 8rem; + margin-right: 8rem; } + +.mx-auto { + margin-left: auto; + margin-right: auto; } + +.text-justify { + text-align: justify; } + +.text-left { + text-align: left; } + +.text-center { + text-align: center; } + +.text-left { + text-align: right; } + +.text-sm { + font-size: 1rem; } + +.text-lg { + font-size: 2rem; } + +.text-xl { + font-size: 2.5rem; } + +.display-none { + display: none; } + +.display-inline { + display: inline; } + +.display-inline-block { + display: inline-block; } + +.display-block { + display: block; } + +.display-flex { + display: flex; } + +.display-inline-flex { + display: inline-flex; } + +.display-table { + display: table; } + +.clearfix:after { + clear: both; + content: ' '; + display: table; } + +.float-left { + float: left; } + +.float-right { + float: right; } + +.container { + margin: 0 auto; + max-width: 112.0rem; + padding: 0 2.0rem; + position: relative; + width: 100%; } + +.row { + display: flex; + flex-direction: column; + padding: 0; + width: 100%; } + .row.row-no-padding { + padding: 0; } + .row.row-no-padding > .column { + padding: 0; } + .row.row-wrap { + flex-wrap: wrap; } + .row.row-top { + align-items: flex-start; } + .row.row-bottom { + align-items: flex-end; } + .row.row-center { + align-items: center; } + .row.row-stretch { + align-items: stretch; } + .row.row-baseline { + align-items: baseline; } + .row .column { + display: block; + flex: 1 1 auto; + margin-left: 0; + max-width: 100%; + width: 100%; } + .row .column.column-offset-10 { + margin-left: 10%; } + .row .column.column-offset-20 { + margin-left: 20%; } + .row .column.column-offset-25 { + margin-left: 25%; } + .row .column.column-offset-33, .row .column.column-offset-34 { + margin-left: 33.3333%; } + .row .column.column-offset-50 { + margin-left: 50%; } + .row .column.column-offset-66, .row .column.column-offset-67 { + margin-left: 66.6666%; } + .row .column.column-offset-75 { + margin-left: 75%; } + .row .column.column-offset-80 { + margin-left: 80%; } + .row .column.column-offset-90 { + margin-left: 90%; } + .row .column.column-10 { + flex: 0 0 10%; + max-width: 10%; } + .row .column.column-20 { + flex: 0 0 20%; + max-width: 20%; } + .row .column.column-25 { + flex: 0 0 25%; + max-width: 25%; } + .row .column.column-33, .row .column.column-34 { + flex: 0 0 33.3333%; + max-width: 33.3333%; } + .row .column.column-40 { + flex: 0 0 40%; + max-width: 40%; } + .row .column.column-50 { + flex: 0 0 50%; + max-width: 50%; } + .row .column.column-60 { + flex: 0 0 60%; + max-width: 60%; } + .row .column.column-66, .row .column.column-67 { + flex: 0 0 66.6666%; + max-width: 66.6666%; } + .row .column.column-75 { + flex: 0 0 75%; + max-width: 75%; } + .row .column.column-80 { + flex: 0 0 80%; + max-width: 80%; } + .row .column.column-90 { + flex: 0 0 90%; + max-width: 90%; } + .row .column .column-top { + align-self: flex-start; } + .row .column .column-bottom { + align-self: flex-end; } + .row .column .column-center { + align-self: center; } + + at media (min-width: 40rem) { + .row { + flex-direction: row; + margin-left: -1.0rem; + width: calc(100% + 2.0rem); } + .row .column { + margin-bottom: inherit; + padding: 0 1.0rem; } } + + at font-face { + font-family: 'ico'; + src: url("../font/ico.eot?13319731"); + src: url("../font/ico.eot?13319731#iefix") format("embedded-opentype"), url("../font/ico.woff2?13319731") format("woff2"), url("../font/ico.woff?13319731") format("woff"), url("../font/ico.ttf?13319731") format("truetype"), url("../font/ico.svg?13319731#ico") format("svg"); + font-weight: normal; + font-style: normal; } + +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* + @media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'ico'; + src: url('../font/ico.svg?13319731#ico') format('svg'); + } + } + */ +[class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "ico"; + font-style: normal; + font-weight: normal; + speak: none; + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } + +/* + Animation example, for spinners + */ +.animate-spin { + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; + display: inline-block; } + + at -moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); } + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); } } + + at -webkit-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); } + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); } } + + at -o-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); } + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); } } + + at -ms-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); } + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); } } + + at keyframes spin { + 0% { + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); } + 100% { + -moz-transform: rotate(359deg); + -o-transform: rotate(359deg); + -webkit-transform: rotate(359deg); + transform: rotate(359deg); } } + +.icon-menu-outline:before { + content: '\e800'; } + +.icon-github-circled:before { + content: '\f09b'; } + +.icon-rss:before { + content: '\f09e'; } + +.icon-menu:before { + content: '\f0c9'; } + +.icon-spinner:before { + content: '\f110'; } + +.icon-code:before { + content: '\f121'; } + +.icon-bitbucket:before { + content: '\f171'; } + +.icon-circle-notch:before { + content: '\f1ce'; } + +.icon-github-text:before { + content: '\f307'; } + +.navbar { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + margin-top: 2rem; + padding-left: 0; + padding-inline-start: 0; } + +.navbar-item { + padding: 0.5rem 0.66rem; + margin: 0 0.2rem; } + +.nav-item-active { + border-radius: .4rem; + border: 0.1rem solid #1890ff; } + .nav-item-active:hover { + border-color: #4B545C; } + +.navbar-menu { + display: none; + position: fixed; + right: 0; + top: 0; + z-index: 100; + padding: 0.5rem 0.66rem; + margin-top: 2rem; + margin-right: 2rem; + border-radius: 50%; + background-color: #fff; } + + at media screen and (max-width: 60rem) { + .navbar { + justify-content: center; } } + +.navbar-smart { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + margin-top: 2rem; + padding-left: 0; + padding-inline-start: 0; } + + at media screen and (max-width: 60rem) { + .navbar-menu-on { + display: block; } + .navbar-smart { + display: none; + flex-direction: column; + align-items: flex-start; + position: fixed; + left: 0; + top: 0; + width: 100%; + z-index: 100; + padding: 1rem; + background-color: rgba(255, 255, 255, 0.98); } + .navbar-open { + display: flex; } } + +.shadow { + -webkit-box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.3); + box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.3); } + +.shadow-lg { + -webkit-box-shadow: 0px 10px 20px 0px rgba(0, 0, 0, 0.8); + -moz-box-shadow: 0px 10px 20px 0px rgba(0, 0, 0, 0.8); + box-shadow: 0px 10px 20px 0px rgba(0, 0, 0, 0.8); } + +.active { + -webkit-box-shadow: 0px 5px 10px 0px rgba(24, 144, 255, 0.2); + -moz-box-shadow: 0px 5px 10px 0px rgba(24, 144, 255, 0.2); + box-shadow: 0px 5px 10px 0px rgba(24, 144, 255, 0.2); } + +.shadow-secondary { + -webkit-box-shadow: 0px 5px 10px 0px rgba(75, 84, 92, 0.2); + -moz-box-shadow: 0px 5px 10px 0px rgba(75, 84, 92, 0.2); + box-shadow: 0px 5px 10px 0px rgba(75, 84, 92, 0.2); } + +.muted { + color: #8B9298; } + + at media screen and (max-width: 40rem) { + .row .column { + text-align: center; } } + +.person { + min-height: 190px; + margin-bottom: 8rem; } + .person h3 { + margin-bottom: 1rem; } + .person img { + float: left; + max-width: 150px; + margin-right: 2rem; + margin-bottom: 1rem; } + .person p { + margin-left: 150px; } + + at media screen and (max-width: 40rem) { + .person img { + float: none; } + .person p { + margin-left: 0; } } + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + color: #9006b3; + background: #f4f5f6; } + +.hljs-comment, +.hljs-quote { + color: #bbbcc2; + font-style: italic; } + +.hljs-doctag, +.hljs-keyword, +.hljs-formula { + color: #dd4600; } + +.hljs-section, +.hljs-name, +.hljs-selector-tag, +.hljs-deletion, +.hljs-subst { + color: #e45649; } + +.hljs-literal { + color: #009c15; } + +.hljs-string, +.hljs-regexp, +.hljs-addition, +.hljs-attribute, +.hljs-meta-string { + color: #2e912c; } + +.hljs-built_in, +.hljs-class .hljs-title { + color: #c1ae01; } + +.hljs-attr, +.hljs-variable, +.hljs-template-variable, +.hljs-type, +.hljs-selector-class, +.hljs-selector-attr, +.hljs-selector-pseudo, +.hljs-number { + color: #b97f00; } + +.hljs-symbol, +.hljs-bullet, +.hljs-link, +.hljs-meta, +.hljs-selector-id, +.hljs-title { + color: #2263f0; } + +.hljs-emphasis { + font-style: italic; } + +.hljs-strong { + font-weight: bold; } + +.hljs-link { + text-decoration: underline; } diff --git a/public/assets/css/code.css b/public/assets/css/code.css new file mode 100644 --- /dev/null +++ b/public/assets/css/code.css @@ -0,0 +1,71 @@ +/* code.css file generated by Nikola */ +pre.code , .highlight pre .hll { background-color: #ffffcc } +pre.code , .highlight pre { background: #f8f8f8; } +pre.code .c, .highlight pre .c { color: #408080; font-style: italic } /* Comment */ +pre.code .err, .highlight pre .err { border: 1px solid #FF0000 } /* Error */ +pre.code .k, .highlight pre .k { color: #008000; font-weight: bold } /* Keyword */ +pre.code .o, .highlight pre .o { color: #666666 } /* Operator */ +pre.code .ch, .highlight pre .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ +pre.code .cm, .highlight pre .cm { color: #408080; font-style: italic } /* Comment.Multiline */ +pre.code .cp, .highlight pre .cp { color: #BC7A00 } /* Comment.Preproc */ +pre.code .cpf, .highlight pre .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ +pre.code .c1, .highlight pre .c1 { color: #408080; font-style: italic } /* Comment.Single */ +pre.code .cs, .highlight pre .cs { color: #408080; font-style: italic } /* Comment.Special */ +pre.code .gd, .highlight pre .gd { color: #A00000 } /* Generic.Deleted */ +pre.code .ge, .highlight pre .ge { font-style: italic } /* Generic.Emph */ +pre.code .gr, .highlight pre .gr { color: #FF0000 } /* Generic.Error */ +pre.code .gh, .highlight pre .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +pre.code .gi, .highlight pre .gi { color: #00A000 } /* Generic.Inserted */ +pre.code .go, .highlight pre .go { color: #888888 } /* Generic.Output */ +pre.code .gp, .highlight pre .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +pre.code .gs, .highlight pre .gs { font-weight: bold } /* Generic.Strong */ +pre.code .gu, .highlight pre .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +pre.code .gt, .highlight pre .gt { color: #0044DD } /* Generic.Traceback */ +pre.code .kc, .highlight pre .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +pre.code .kd, .highlight pre .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +pre.code .kn, .highlight pre .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +pre.code .kp, .highlight pre .kp { color: #008000 } /* Keyword.Pseudo */ +pre.code .kr, .highlight pre .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +pre.code .kt, .highlight pre .kt { color: #B00040 } /* Keyword.Type */ +pre.code .m, .highlight pre .m { color: #666666 } /* Literal.Number */ +pre.code .s, .highlight pre .s { color: #BA2121 } /* Literal.String */ +pre.code .na, .highlight pre .na { color: #7D9029 } /* Name.Attribute */ +pre.code .nb, .highlight pre .nb { color: #008000 } /* Name.Builtin */ +pre.code .nc, .highlight pre .nc { color: #0000FF; font-weight: bold } /* Name.Class */ +pre.code .no, .highlight pre .no { color: #880000 } /* Name.Constant */ +pre.code .nd, .highlight pre .nd { color: #AA22FF } /* Name.Decorator */ +pre.code .ni, .highlight pre .ni { color: #999999; font-weight: bold } /* Name.Entity */ +pre.code .ne, .highlight pre .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +pre.code .nf, .highlight pre .nf { color: #0000FF } /* Name.Function */ +pre.code .nl, .highlight pre .nl { color: #A0A000 } /* Name.Label */ +pre.code .nn, .highlight pre .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +pre.code .nt, .highlight pre .nt { color: #008000; font-weight: bold } /* Name.Tag */ +pre.code .nv, .highlight pre .nv { color: #19177C } /* Name.Variable */ +pre.code .ow, .highlight pre .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +pre.code .w, .highlight pre .w { color: #bbbbbb } /* Text.Whitespace */ +pre.code .mb, .highlight pre .mb { color: #666666 } /* Literal.Number.Bin */ +pre.code .mf, .highlight pre .mf { color: #666666 } /* Literal.Number.Float */ +pre.code .mh, .highlight pre .mh { color: #666666 } /* Literal.Number.Hex */ +pre.code .mi, .highlight pre .mi { color: #666666 } /* Literal.Number.Integer */ +pre.code .mo, .highlight pre .mo { color: #666666 } /* Literal.Number.Oct */ +pre.code .sa, .highlight pre .sa { color: #BA2121 } /* Literal.String.Affix */ +pre.code .sb, .highlight pre .sb { color: #BA2121 } /* Literal.String.Backtick */ +pre.code .sc, .highlight pre .sc { color: #BA2121 } /* Literal.String.Char */ +pre.code .dl, .highlight pre .dl { color: #BA2121 } /* Literal.String.Delimiter */ +pre.code .sd, .highlight pre .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +pre.code .s2, .highlight pre .s2 { color: #BA2121 } /* Literal.String.Double */ +pre.code .se, .highlight pre .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +pre.code .sh, .highlight pre .sh { color: #BA2121 } /* Literal.String.Heredoc */ +pre.code .si, .highlight pre .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +pre.code .sx, .highlight pre .sx { color: #008000 } /* Literal.String.Other */ +pre.code .sr, .highlight pre .sr { color: #BB6688 } /* Literal.String.Regex */ +pre.code .s1, .highlight pre .s1 { color: #BA2121 } /* Literal.String.Single */ +pre.code .ss, .highlight pre .ss { color: #19177C } /* Literal.String.Symbol */ +pre.code .bp, .highlight pre .bp { color: #008000 } /* Name.Builtin.Pseudo */ +pre.code .fm, .highlight pre .fm { color: #0000FF } /* Name.Function.Magic */ +pre.code .vc, .highlight pre .vc { color: #19177C } /* Name.Variable.Class */ +pre.code .vg, .highlight pre .vg { color: #19177C } /* Name.Variable.Global */ +pre.code .vi, .highlight pre .vi { color: #19177C } /* Name.Variable.Instance */ +pre.code .vm, .highlight pre .vm { color: #19177C } /* Name.Variable.Magic */ +pre.code .il, .highlight pre .il { color: #666666 } /* Literal.Number.Integer.Long */ +table.codetable { width: 100%;} td.linenos {text-align: right; width: 4em;} diff --git a/public/assets/css/html4css1.css b/public/assets/css/html4css1.css new file mode 100644 --- /dev/null +++ b/public/assets/css/html4css1.css @@ -0,0 +1,1 @@ + at import url("rst_base.css"); diff --git a/public/assets/css/ipython.min.css b/public/assets/css/ipython.min.css new file mode 100644 --- /dev/null +++ b/public/assets/css/ipython.min.css @@ -0,0 +1,9 @@ +/*! +* +* IPython base +* +*/.modal.fade .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}code{color:#000}pre{font-size:inherit;line-height:inherit}label{font-weight:normal}.border-box-sizing{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.corner-all{border-radius:2px}.no-padding{padding:0}.hbox{display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}.hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}.vbox{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}.vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}.hbox.reverse,.vbox.reverse,.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:row-reverse}.hbox.box-flex0,.vbox.box-flex0,.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none;width:auto}.hbox.box-flex1,.vbox.box-flex1,.box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}.hbox.box-flex,.vbox.box-flex,.box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}.hbox.box-flex2,.vbox.box-flex2,.box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2}.box-group1{-webkit-box-flex-group:1;-moz-box-flex-group:1;box-flex-group:1}.box-group2{-webkit-box-flex-group:2;-moz-box-flex-group:2;box-flex-group:2}.hbox.start,.vbox.start,.start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start}.hbox.end,.vbox.end,.end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end}.hbox.center,.vbox.center,.center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center}.hbox.baseline,.vbox.baseline,.baseline{-webkit-box-pack:baseline;-moz-box-pack:baseline;box-pack:baseline;justify-content:baseline}.hbox.stretch,.vbox.stretch,.stretch{-webkit-box-pack:stretch;-moz-box-pack:stretch;box-pack:stretch;justify-content:stretch}.hbox.align-start,.vbox.align-start,.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}.hbox.align-end,.vbox.align-end,.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-items:flex-end}.hbox.align-center,.vbox.align-center,.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-items:center}.hbox.align-baseline,.vbox.align-baseline,.align-baseline{-webkit-box-align:baseline;-moz-box-align:baseline;box-align:baseline;align-items:baseline}.hbox.align-stretch,.vbox.align-stretch,.align-stretch{-webkit-box-align:stretch;-moz-box-align:stretch;box-align:stretch;align-items:stretch}div.error{margin:2em;text-align:center}div.error>h1{font-size:500%;line-height:normal}div.error>p{font-size:200%;line-height:normal}div.traceback-wrapper{text-align:left;max-width:800px;margin:auto}div.traceback-wrapper pre.traceback{max-height:600px;overflow:auto}/*! +* +* IPython notebook +* +*/.ansi-black-fg{color:#3e424d}.ansi-black-bg{background-color:#3e424d}.ansi-black-intense-fg{color:#282c36}.ansi-black-intense-bg{background-color:#282c36}.ansi-red-fg{color:#e75c58}.ansi-red-bg{background-color:#e75c58}.ansi-red-intense-fg{color:#b22b31}.ansi-red-intense-bg{background-color:#b22b31}.ansi-green-fg{color:#00a250}.ansi-green-bg{background-color:#00a250}.ansi-green-intense-fg{color:#007427}.ansi-green-intense-bg{background-color:#007427}.ansi-yellow-fg{color:#ddb62b}.ansi-yellow-bg{background-color:#ddb62b}.ansi-yellow-intense-fg{color:#b27d12}.ansi-yellow-intense-bg{background-color:#b27d12}.ansi-blue-fg{color:#208ffb}.ansi-blue-bg{background-color:#208ffb}.ansi-blue-intense-fg{color:#0065ca}.ansi-blue-intense-bg{background-color:#0065ca}.ansi-magenta-fg{color:#d160c4}.ansi-magenta-bg{background-color:#d160c4}.ansi-magenta-intense-fg{color:#a03196}.ansi-magenta-intense-bg{background-color:#a03196}.ansi-cyan-fg{color:#60c6c8}.ansi-cyan-bg{background-color:#60c6c8}.ansi-cyan-intense-fg{color:#258f8f}.ansi-cyan-intense-bg{background-color:#258f8f}.ansi-white-fg{color:#c5c1b4}.ansi-white-bg{background-color:#c5c1b4}.ansi-white-intense-fg{color:#a1a6b2}.ansi-white-intense-bg{background-color:#a1a6b2}.ansi-bold{font-weight:bold}.ansi-underline{text-decoration:underline}.ansi-inverse{outline:.5px dotted}.ansibold{font-weight:bold}.ansiblack{color:black}.ansired{color:darkred}.ansigreen{color:darkgreen}.ansiyellow{color:#c4a000}.ansiblue{color:darkblue}.ansipurple{color:darkviolet}.ansicyan{color:steelblue}.ansigray{color:gray}.ansibgblack{background-color:black}.ansibgred{background-color:red}.ansibggreen{background-color:green}.ansibgyellow{background-color:yellow}.ansibgblue{background-color:blue}.ansibgpurple{background-color:magenta}.ansibgcyan{background-color:cyan}.ansibggray{background-color:gray}div.cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch;border-radius:2px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border-width:1px;border-style:solid;border-color:transparent;width:100%;padding:5px;margin:0;outline:0;position:relative;overflow:visible}div.cell:before{position:absolute;display:block;top:-1px;left:-1px;width:5px;height:calc(100%+2px);content:'';background:transparent}div.cell.jupyter-soft-selected{border-left-color:#e3f2fd;border-left-width:1px;padding-left:5px;border-right-color:#e3f2fd;border-right-width:1px;background:#e3f2fd}@media print{div.cell.jupyter-soft-selected{border-color:transparent}}div.cell.selected,div.cell.selected.jupyter-soft-selected{border-color:#ababab}div.cell.selected:before,div.cell.selected.jupyter-soft-selected:before{position:absolute;display:block;top:-1px;left:-1px;width:5px;height:calc(100%+2px);content:'';background:#42a5f5}@media print{div.cell.selected,div.cell.selected.jupyter-soft-selected{border-color:transparent}}.edit_mode div.cell.selected{border-color:#66bb6a}.edit_mode div.cell.selected:before{position:absolute;display:block;top:-1px;left:-1px;width:5px;height:calc(100%+2px);content:'';background:#66bb6a}@media print{.edit_mode div.cell.selected{border-color:transparent}}.prompt{min-width:14ex;padding:.4em;margin:0;font-family:monospace;text-align:right;line-height:1.21429em;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}@media(max-width:540px){.prompt{text-align:left}}div.inner_cell{min-width:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}div.input_area>div.highlight>pre{border:1px solid #cfcfcf;line-height:1.21429em}div.prompt:empty{padding-top:0;padding-bottom:0}div.unrecognized_cell{padding:5px 5px 5px 0;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}div.unrecognized_cell .inner_cell{border-radius:2px;padding:5px;font-weight:bold;color:red;border:1px solid #cfcfcf;background:#eaeaea}div.unrecognized_cell .inner_cell a{color:inherit;text-decoration:none}div.unrecognized_cell .inner_cell a:hover{color:inherit;text-decoration:none}@media(max-width:540px){div.unrecognized_cell>div.prompt{display:none}}@media print{div.code_cell{page-break-inside:avoid}}div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}@media(max-width:540px){div.input{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}}div.input_prompt{color:#303f9f;border-top:1px solid transparent}div.input_area>div.highlight{margin:0;border:0;padding:0;background-color:transparent}div.input_area>div.highlight>pre{margin:0;border:0;padding:.4em}.CodeMirror{line-height:1.21429em;font-size:14px;height:auto;background:0}.CodeMirror-scroll{overflow-y:hidden;overflow-x:auto}.CodeMirror-lines{padding:.4em}.CodeMirror-linenumber{padding:0 8px 0 4px}.CodeMirror-gutters{border-bottom-left-radius:2px;border-top-left-radius:2px}.CodeMirror pre{padding:0;border:0;border-radius:0}.highlight-base{color:#000}.highlight-variable{color:#000}.highlight-variable-2{color:#1a1a1a}.highlight-variable-3{color:#333}.highlight-string{color:#ba2121}.highlight-comment{color:#408080;font-style:italic}.highlight-number{color:#080}.highlight-atom{color:#88F}.highlight-keyword{color:#008000;font-weight:bold}.highlight-builtin{color:#008000}.highlight-error{color:red}.highlight-operator{color:#a2f;font-weight:bold}.highlight-meta{color:#a2f}.highlight-def{color:#00f}.highlight-string-2{color:#f50}.highlight-qualifier{color:#555}.highlight-bracket{color:#997}.highlight-tag{color:#170}.highlight-attribute{color:#00c}.highlight-header{color:blue}.highlight-quote{color:#090}.highlight-link{color:#00c}.cm-s-ipython span.cm-keyword{color:#008000;font-weight:bold}.cm-s-ipython span.cm-atom{color:#88F}.cm-s-ipython span.cm-number{color:#080}.cm-s-ipython span.cm-def{color:#00f}.cm-s-ipython span.cm-variable{color:#000}.cm-s-ipython span.cm-operator{color:#a2f;font-weight:bold}.cm-s-ipython span.cm-variable-2{color:#1a1a1a}.cm-s-ipython span.cm-variable-3{color:#333}.cm-s-ipython span.cm-comment{color:#408080;font-style:italic}.cm-s-ipython span.cm-string{color:#ba2121}.cm-s-ipython span.cm-string-2{color:#f50}.cm-s-ipython span.cm-meta{color:#a2f}.cm-s-ipython span.cm-qualifier{color:#555}.cm-s-ipython span.cm-builtin{color:#008000}.cm-s-ipython span.cm-bracket{color:#997}.cm-s-ipython span.cm-tag{color:#170}.cm-s-ipython span.cm-attribute{color:#00c}.cm-s-ipython span.cm-header{color:blue}.cm-s-ipython span.cm-quote{color:#090}.cm-s-ipython span.cm-link{color:#00c}.cm-s-ipython span.cm-error{color:red}.cm-s-ipython span.cm-tab{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);background-position:right;background-repeat:no-repeat}div.output_wrapper{position:relative;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch;z-index:1}div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:2px;-webkit-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);display:block}div.output_collapsed{margin:0;padding:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}div.out_prompt_overlay{height:100%;padding:0 .4em;position:absolute;border-radius:2px}div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000;box-shadow:inset 0 0 1px #000;background:rgba(240,240,240,0.5)}div.output_prompt{color:#d84315}div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}div.output_area .MathJax_Display{text-align:left !important}div.output_area .rendered_html table{margin-left:0;margin-right:0}div.output_area .rendered_html img{margin-left:0;margin-right:0}div.output_area img,div.output_area svg{max-width:100%;height:auto}div.output_area img.unconfined,div.output_area svg.unconfined{max-width:none}div.output_area .mglyph>img{max-width:none}.output{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}@media(max-width:540px){div.output_area{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}}div.output_area pre{margin:0;padding:0;border:0;vertical-align:baseline;color:black;background-color:transparent;border-radius:0}div.output_subarea{overflow-x:auto;padding:.4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1;max-width:calc(100% - 14ex)}div.output_scroll div.output_subarea{overflow-x:visible}div.output_text{text-align:left;color:#000;line-height:1.21429em}div.output_stderr{background:#fdd}div.output_latex{text-align:left}div.output_javascript:empty{padding:0}.js-error{color:darkred}div.raw_input_container{line-height:1.21429em;padding-top:5px}input.raw_input{font-family:monospace;font-size:inherit;color:inherit;width:auto;vertical-align:baseline;padding:0 .25em;margin:0 .25em}input.raw_input:focus{box-shadow:none}p.p-space{margin-bottom:10px}div.output_unrecognized{padding:5px;font-weight:bold;color:red}div.output_unrecognized a{color:inherit;text-decoration:none}div.output_unrecognized a:hover{color:inherit;text-decoration:none}.rendered_html{color:#000}.rendered_html em{font-style:italic}.rendered_html strong{font-weight:bold}.rendered_html u{text-decoration:underline}.rendered_html :link{text-decoration:underline}.rendered_html :visited{text-decoration:underline}.rendered_html h1{font-size:185.7%;margin:1.08em 0 0 0;font-weight:bold;line-height:1.0}.rendered_html h2{font-size:157.1%;margin:1.27em 0 0 0;font-weight:bold;line-height:1.0}.rendered_html h3{font-size:128.6%;margin:1.55em 0 0 0;font-weight:bold;line-height:1.0}.rendered_html h4{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1.0}.rendered_html h5{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1.0;font-style:italic}.rendered_html h6{font-size:100%;margin:2em 0 0 0;font-weight:bold;line-height:1.0;font-style:italic}.rendered_html h1:first-child{margin-top:.538em}.rendered_html h2:first-child{margin-top:.636em}.rendered_html h3:first-child{margin-top:.777em}.rendered_html h4:first-child{margin-top:1em}.rendered_html h5:first-child{margin-top:1em}.rendered_html h6:first-child{margin-top:1em}.rendered_html ul:not(.list-inline),.rendered_html ol:not(.list-inline){padding-left:2em}.rendered_html ul{list-style:disc}.rendered_html ul ul{list-style:square}.rendered_html ul ul ul{list-style:circle}.rendered_html ol{list-style:decimal}.rendered_html ol ol{list-style:upper-alpha}.rendered_html ol ol ol{list-style:lower-alpha}.rendered_html ol ol ol ol{list-style:lower-roman}.rendered_html ol ol ol ol ol{list-style:decimal}.rendered_html *+ul{margin-top:1em}.rendered_html *+ol{margin-top:1em}.rendered_html hr{color:black;background-color:black}.rendered_html pre{margin:1em 2em}.rendered_html pre,.rendered_html code{border:0;background-color:#fff;color:#000;font-size:100%;padding:0}.rendered_html blockquote{margin:1em 2em}.rendered_html table{margin-left:auto;margin-right:auto;border:0;border-collapse:collapse;border-spacing:0;color:black;font-size:12px;table-layout:fixed}.rendered_html thead{border-bottom:1px solid black;vertical-align:bottom}.rendered_html tr,.rendered_html th,.rendered_html td{text-align:right;vertical-align:middle;padding:.5em .5em;line-height:normal;white-space:normal;max-width:none;border:0}.rendered_html th{font-weight:bold}.rendered_html tbody tr:nth-child(odd){background:#f5f5f5}.rendered_html tbody tr:hover{background:rgba(66,165,245,0.2)}.rendered_html *+table{margin-top:1em}.rendered_html p{text-align:left}.rendered_html *+p{margin-top:1em}.rendered_html img{display:block;margin-left:auto;margin-right:auto}.rendered_html *+img{margin-top:1em}.rendered_html img,.rendered_html svg{max-width:100%;height:auto}.rendered_html img.unconfined,.rendered_html svg.unconfined{max-width:none}.rendered_html .alert{margin-bottom:initial}.rendered_html *+.alert{margin-top:1em}div.text_cell{display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}@media(max-width:540px){div.text_cell>div.prompt{display:none}}div.text_cell_render{outline:0;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden}h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible}.text_cell.rendered .input_area{display:none}.text_cell.rendered .rendered_html{overflow-x:auto;overflow-y:hidden}.text_cell.rendered .rendered_html tr,.text_cell.rendered .rendered_html th,.text_cell.rendered .rendered_html td{max-width:none}.text_cell.unrendered .text_cell_render{display:none}.text_cell .dropzone .input_area{border:2px dashed #bababa;margin:-1px}.cm-header-1,.cm-header-2,.cm-header-3,.cm-header-4,.cm-header-5,.cm-header-6{font-weight:bold;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}.cm-header-1{font-size:185.7%}.cm-header-2{font-size:157.1%}.cm-header-3{font-size:128.6%}.cm-header-4{font-size:110%}.cm-header-5{font-size:100%;font-style:italic}.cm-header-6{font-size:100%;font-style:italic} diff --git a/public/assets/css/nikola_ipython.css b/public/assets/css/nikola_ipython.css new file mode 100644 --- /dev/null +++ b/public/assets/css/nikola_ipython.css @@ -0,0 +1,56 @@ +div.prompt { + padding: 0.6em; + font-size: 13px; + background-color: #E9E9E9; + margin-right: 1em; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +div.output_prompt { + /* 5px right shift to account for margin in parent container */ + margin: 0 5px 0 0px; +} + +div.output_area pre { + font-size: 13px; +} + +div.text_cell_render { + padding: 0px; + color: #333333; +} + +.rendered_html p { + text-align: left; +} + +.rendered_html ul { + margin: 0 0 12px 25px; +} + +.rendered_html :visited { + text-decoration: none; +} + +.rendered_html :link { + text-decoration: none; +} + +.rendered_html pre, .rendered_html code { + background-color: #DDDDDD; + margin: 1em 0em; + font-size: 14px; +} + +.rendered_html pre { + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.05em; + padding-bottom: 0.05em; +} + +.page-content > .content p { + margin: 0 0 0px; +} diff --git a/public/assets/css/nikola_rst.css b/public/assets/css/nikola_rst.css new file mode 100644 --- /dev/null +++ b/public/assets/css/nikola_rst.css @@ -0,0 +1,64 @@ +div.admonition, div.attention, div.caution, div.danger, div.error, +div.hint, div.important, div.note, div.tip, div.warning, div.sidebar, +div.system-message { +/* stolen from Boostrap 4 (.card) */ + margin-bottom: 2rem; + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #fff; + color: #212529; + background-clip: border-box; + border: 1px solid rgba(0,0,0,.125); + border-radius: .25rem; + padding: 0; +} + +div.attention, div.caution, div.danger, div.error, div.warning { + /* stolen from Boostrap 3 (.border-danger) */ + border-color: #dc3545!important; +} + +div.admonition p, div.hint p, +div.important p, div.note p, +div.tip p, div.sidebar p, +div.attention p, div.caution p, +div.danger p, div.error p, +div.warning p, div.system-message p { + padding-left: 1rem; + padding-right: 1rem; +} + +div.admonition p.admonition-title, div.hint p.admonition-title, +div.important p.admonition-title, div.note p.admonition-title, +div.tip p.admonition-title, div.sidebar p.sidebar-title, +div.attention p.admonition-title, div.caution p.admonition-title, +div.danger p.admonition-title, div.error p.admonition-title, +div.warning p.admonition-title, div.system-message p.system-message-title { +/* stolen from Boostrap 4 (.card .card-header) */ + font-weight: 400; + font-size: 1.25rem; + padding: .75rem 1.25rem; + margin-bottom: 1rem; + background-color: rgba(0,0,0,.03); + border-bottom: 1px solid rgba(0,0,0,.125); +} + +div.attention p.admonition-title, div.caution p.admonition-title, +div.danger p.admonition-title, div.error p.admonition-title, +div.warning p.admonition-title, div.system-message p.system-message-title { + /* stolen from Boostrap 4 (.card .card-header .bg-danger) */ + background-color: #dc3545; + color: white; +} + +div.sidebar { + margin-right: 0; +} diff --git a/public/assets/css/rst.css b/public/assets/css/rst.css new file mode 100644 --- /dev/null +++ b/public/assets/css/rst.css @@ -0,0 +1,2 @@ + at import url("rst_base.css"); + at import url("nikola_rst.css"); diff --git a/public/assets/css/rst_base.css b/public/assets/css/rst_base.css new file mode 100644 --- /dev/null +++ b/public/assets/css/rst_base.css @@ -0,0 +1,474 @@ +/* Minimal style sheet for the HTML output of Docutils. */ +/* */ +/* :Author: Günter Milde, based on html4css1.css by David Goodger */ +/* :Id: $Id: minimal.css 7952 2016-07-26 18:15:59Z milde $ */ +/* :Copyright: © 2015 Günter Milde. */ +/* :License: Released under the terms of the `2-Clause BSD license`_, */ +/* in short: */ +/* */ +/* Copying and distribution of this file, with or without modification, */ +/* are permitted in any medium without royalty provided the copyright */ +/* notice and this notice are preserved. */ +/* */ +/* This file is offered as-is, without any warranty. */ +/* */ +/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */ + +/* This CSS2.1_ stylesheet defines rules for Docutils elements without */ +/* HTML equivalent. It is required to make the document semantic visible. */ +/* */ +/* .. _CSS2.1: http://www.w3.org/TR/CSS2 */ +/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */ + +/* alignment of text and inline objects inside block objects*/ +.align-left { text-align: left; } +.align-right { text-align: right; } +.align-center { clear: both; text-align: center; } +.align-top { vertical-align: top; } +.align-middle { vertical-align: middle; } +.align-bottom { vertical-align: bottom; } + +/* titles */ +h1.title, p.subtitle { + text-align: center; +} +p.admonition-title, +p.topic-title, +p.sidebar-title, +p.rubric, +p.system-message-title { + font-weight: bold; +} +h1 + p.subtitle, +h1 + p.section-subtitle { + font-size: 1.6em; +} +h2 + p.section-subtitle { font-size: 1.28em; } +p.subtitle, +p.section-subtitle, +p.sidebar-subtitle { + font-weight: bold; + margin-top: -0.5em; +} +p.sidebar-title, +p.rubric { + font-size: larger; +} +p.rubric { color: maroon; } +a.toc-backref { + color: black; + text-decoration: none; } + +/* Warnings, Errors */ +div.caution p.admonition-title, +div.attention p.admonition-title, +div.danger p.admonition-title, +div.error p.admonition-title, +div.warning p.admonition-title, +div.system-messages h1, +div.error, +span.problematic, +p.system-message-title { + color: red; +} + +/* inline literals */ +span.docutils.literal { + font-family: monospace; + white-space: pre-wrap; +} +/* do not wraph at hyphens and similar: */ +.literal > span.pre { white-space: nowrap; } + +/* Lists */ + +/* compact and simple lists: no margin between items */ +.simple li, .compact li, +.simple ul, .compact ul, +.simple ol, .compact ol, +.simple > li p, .compact > li p, +dl.simple > dd, dl.compact > dd { + margin-top: 0; + margin-bottom: 0; +} + +/* Table of Contents */ +/*div.topic.contents { margin: 0; }*/ +ul.auto-toc { + list-style-type: none; + padding-left: 1.5em; } + +/* Enumerated Lists */ +ol.arabic { list-style: decimal } +ol.loweralpha { list-style: lower-alpha } +ol.upperalpha { list-style: upper-alpha } +ol.lowerroman { list-style: lower-roman } +ol.upperroman { list-style: upper-roman } + +dt span.classifier { font-style: italic } +dt span.classifier:before { + font-style: normal; + margin: 0.5em; + content: ":"; +} + +/* Field Lists and drivatives */ +/* bold field name, content starts on the same line */ +dl.field-list > dt, +dl.option-list > dt, +dl.docinfo > dt, +dl.footnote > dt, +dl.citation > dt { + font-weight: bold; + clear: left; + float: left; + margin: 0; + padding: 0; + padding-right: 0.5em; +} +/* Offset for field content (corresponds to the --field-name-limit option) */ +dl.field-list > dd, +dl.option-list > dd, +dl.docinfo > dd { + margin-left: 9em; /* ca. 14 chars in the test examples */ +} +/* start field-body on a new line after long field names */ +dl.field-list > dd > *:first-child, +dl.option-list > dd > *:first-child +{ + display: inline-block; + width: 100%; + margin: 0; +} +/* field names followed by a colon */ +dl.field-list > dt:after, +dl.docinfo > dt:after { + content: ":"; +} + +/* Bibliographic Fields (docinfo) */ +pre.address { font: inherit; } +dd.authors > p { margin: 0; } + +/* Option Lists */ +dl.option-list { margin-left: 40px; } +dl.option-list > dt { font-weight: normal; } +span.option { white-space: nowrap; } + +/* Footnotes and Citations */ +dl.footnote.superscript > dd {margin-left: 1em; } +dl.footnote.brackets > dd {margin-left: 2em; } +dl > dt.label { font-weight: normal; } +a.footnote-reference.brackets:before, +dt.label > span.brackets:before { content: "["; } +a.footnote-reference.brackets:after, +dt.label > span.brackets:after { content: "]"; } +a.footnote-reference.superscript, +dl.footnote.superscript > dt.label { + vertical-align: super; + font-size: smaller; +} +dt.label > span.fn-backref { margin-left: 0.2em; } +dt.label > span.fn-backref > a { font-style: italic; } + +/* Line Blocks */ +div.line-block { display: block; } +div.line-block div.line-block { + margin-top: 0; + margin-bottom: 0; + margin-left: 40px; +} + +/* Figures, Images, and Tables */ +.figure.align-left, +img.align-left, +object.align-left, +table.align-left { + margin-right: auto; +} +.figure.align-center, +img.align-center, +object.align-center { + margin-left: auto; + margin-right: auto; + display: block; +} +table.align-center { + margin-left: auto; + margin-right: auto; +} +.figure.align-right, +img.align-right, +object.align-right, +table.align-right { + margin-left: auto; +} +/* reset inner alignment in figures and tables */ +div.align-left, div.align-center, div.align-right, +table.align-left, table.align-center, table.align-right +{ text-align: inherit } + +/* Admonitions and System Messages */ +div.admonition, +div.system-message, +div.sidebar{ + margin: 40px; + border: medium outset; + padding-right: 1em; + padding-left: 1em; +} + +/* Sidebar */ +div.sidebar { + width: 30%; + max-width: 26em; + float: right; + clear: right; +} + +/* Text Blocks */ +div.topic, +pre.literal-block, +pre.doctest-block, +pre.math, +pre.code { + margin-right: 40px; + margin-left: 40px; +} +pre.code .ln { color: gray; } /* line numbers */ + +/* Tables */ +table.docutils { border-collapse: collapse; } +table.docutils > td, table.docutils > th { + border-style: solid; + border-color: silver; + padding: 0 1ex; + border-width: thin; +} +table.docutils > td > p:first-child, table.docutils > th > p:first-child { margin-top: 0; } +table.docutils > td > p, table.docutils > th > p { margin-bottom: 0; } + +table.docutils > caption { + text-align: left; + margin-bottom: 0.25em +} + +table.borderless td, table.borderless th { + border: 0; + padding: 0; + padding-right: 0.5em /* separate table cells */ +} + +/* CSS31_ style sheet for the output of Docutils HTML writers. */ +/* Rules for easy reading and pre-defined style variants. */ +/* */ +/* :Author: Günter Milde, based on html4css1.css by David Goodger */ +/* :Id: $Id: plain.css 7952 2016-07-26 18:15:59Z milde $ */ +/* :Copyright: © 2015 Günter Milde. */ +/* :License: Released under the terms of the `2-Clause BSD license`_, */ +/* in short: */ +/* */ +/* Copying and distribution of this file, with or without modification, */ +/* are permitted in any medium without royalty provided the copyright */ +/* notice and this notice are preserved. */ +/* */ +/* This file is offered as-is, without any warranty. */ +/* */ +/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */ +/* .. _CSS3: http://www.w3.org/TR/CSS3 */ + + +/* Document Structure */ +/* ****************** */ + +/* Sections */ + +/* Transitions */ + +hr.docutils { + width: 80%; + margin-top: 1em; + margin-bottom: 1em; + clear: both; +} From pypy.commits at gmail.com Wed Jan 8 03:41:57 2020 From: pypy.commits at gmail.com (cfbolz) Date: Wed, 08 Jan 2020 00:41:57 -0800 (PST) Subject: [pypy-commit] pypy.org nikola: fix two typos Message-ID: <5e1595d5.1c69fb81.336b0.fcdb@mx.google.com> Author: Carl Friedrich Bolz-Tereick Branch: nikola Changeset: r971:8c85569a1071 Date: 2020-01-08 09:38 +0100 http://bitbucket.org/pypy/pypy.org/changeset/8c85569a1071/ Log: fix two typos diff --git a/pages/index.rst b/pages/index.rst --- a/pages/index.rst +++ b/pages/index.rst @@ -41,14 +41,14 @@ .. class:: small -On average, PyPy is **4.4 times faser** than CPython +On average, PyPy is **4.4 times faster** than CPython .. figure:: images/pypy_speed_graph.png :alt: PyPy vs. Python speed comparison graph" :figclass: text-sm PyPy trunk (with JIT) benchmark times normalized to CPython. Smaller is - better. Based on he geometric average of all benchmarks + better. Based on the geometric average of all benchmarks .. raw:: html diff --git a/public/archive.html b/public/archive.html --- a/public/archive.html +++ b/public/archive.html @@ -61,7 +61,7 @@

No posts found.

 diff --git a/public/blog/index.html b/public/blog/index.html --- a/public/blog/index.html +++ b/public/blog/index.html @@ -64,7 +64,7 @@ diff --git a/public/categories/index.html b/public/categories/index.html --- a/public/categories/index.html +++ b/public/categories/index.html @@ -63,7 +63,7 @@ diff --git a/public/compat.html b/public/compat.html --- a/public/compat.html +++ b/public/compat.html @@ -109,11 +109,11 @@ not support refcounting semantics. The following code won't fill the file immediately, but only after a certain period of time, when the GC does a collection:

-
open("filename", "w").write("stuff")
+
open("filename", "w").write("stuff")
 

 
The proper fix is

-
with open("filename", "w") as f:
-    f.write("stuff")
+
with open("filename", "w") as f:
+    f.write("stuff")
 

 
The same problem---not closing your files---can also show up if your
 program opens a large number of files without closing them explicitly.
@@ -127,22 +127,22 @@
 
Similarly, remember that you must close() a non-exhausted
 generator in order to have its pending finally or with
 clauses executed immediately:

-
def mygen():
-    with foo:
-        yield 42
-
-for x in mygen():
-    if x == 42:
-        break    # foo.__exit__ is not run immediately!
-
-# fixed version:
-gen = mygen()
-try:
-    for x in gen:
-        if x == 42:
-            break
-finally:
-    gen.close()
+
def mygen():
+    with foo:
+        yield 42
+
+for x in mygen():
+    if x == 42:
+        break    # foo.__exit__ is not run immediately!
+
+# fixed version:
+gen = mygen()
+try:
+    for x in gen:
+        if x == 42:
+            break
+finally:
+    gen.close()
 

 
More generally, __del__() methods are not executed as predictively
 as on CPython: they run "some time later" in PyPy (or not at all if
@@ -163,7 +163,7 @@
     
 

diff --git a/public/contact.html b/public/contact.html
--- a/public/contact.html
+++ b/public/contact.html
@@ -82,7 +82,7 @@
     
 
diff --git a/public/download.html b/public/download.html
--- a/public/download.html
+++ b/public/download.html
@@ -257,11 +257,11 @@
 trunk using Mercurial.  The trunk usually works and is of course
 more up-to-date.  The following command should run in about 7 minutes
 nowadays if you have hg >= 3.7 (it is much slower with older versions):

-
hg clone https://bitbucket.org/pypy/pypy
+
hg clone https://bitbucket.org/pypy/pypy
 

 
The trunk contains PyPy 2.  For PyPy 3, switch to the correct branch:

-
# switch to the branch that implements Python 3.6
-hg update py3.6
+
# switch to the branch that implements Python 3.6
+hg update py3.6
 

 
Alternatively, get one of the following smaller packages for the source at
 the same revision as the above binaries:

@@ -275,19 +275,19 @@
 
 
  • 
 
    Enter the goal directory:
    
-
    cd pypy/pypy/goal
+
    cd pypy/pypy/goal
 
    
 
    • 
 
  • 
 
    Run the rpython script.  Here are the common combinations
 of options (works also with python instead of pypy;
 requires CPython 2.7 or PyPy 2, even to build PyPy 3):
    
-
    # get the JIT version
-pypy ../../rpython/bin/rpython -Ojit targetpypystandalone
-# get the no-jit version
-pypy ../../rpython/bin/rpython -O2 targetpypystandalone
-# get the sandbox version
-pypy ../../rpython/bin/rpython -O2 --sandbox targetpypystandalone
+
    # get the JIT version
+pypy ../../rpython/bin/rpython -Ojit targetpypystandalone
+# get the no-jit version
+pypy ../../rpython/bin/rpython -O2 targetpypystandalone
+# get the sandbox version
+pypy ../../rpython/bin/rpython -O2 --sandbox targetpypystandalone
 
    
 
    • 
 
  • Enjoy Mandelbrot :-)  It takes on the order of half an hour to
@@ -320,9 +320,9 @@
 call it with ...pypy-c ../../rpython/bin/rpython -Ojit.
    
 
    2. if even using PyPy instead of CPython is not enough, try to tweak
 some internal parameters.  Example (slower but saves around 400MB):
    
-
    PYPY_DONT_RUN_SUBPROCESS=1 PYPY_GC_MAX_DELTA=200MB \
-pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit --source
-# then read the next point about --source
+
    PYPY_DONT_RUN_SUBPROCESS=1 PYPY_GC_MAX_DELTA=200MB \
+pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit --source
+# then read the next point about --source
 
    
 
    • 
 
  • You can run translations with --source, which only builds the C
@@ -343,9 +343,9 @@
 
    Once PyPy is translated from source the binary package similar to those
 provided in the section Default (with a JIT Compiler) above could be
 easily created with package.py script:
    
-
    cd ./pypy/pypy/tool/release/
-python package.py --help #for information
-python package.py --archive-name pypy-my-own-package-name
+
    cd ./pypy/pypy/tool/release/
+python package.py --help #for information
+python package.py --archive-name pypy-my-own-package-name
 
    
 
    It is recommended to use package.py because custom scripts will
 invariably become out-of-date.  If you want to write custom scripts
@@ -455,7 +455,7 @@
     
 
    
diff --git a/public/features.html b/public/features.html
--- a/public/features.html
+++ b/public/features.html
@@ -157,16 +157,16 @@
 build pypy-sandbox from it (see Building from source).  These
 instructions give you a pypy-c that you should rename to
 pypy-sandbox to avoid future confusion.  Then run:
    
-
    cd pypy/sandbox
-pypy_interact.py path/to/pypy-sandbox
-# don't confuse it with pypy/goal/pyinteractive.py!
+
    cd pypy/sandbox
+pypy_interact.py path/to/pypy-sandbox
+# don't confuse it with pypy/goal/pyinteractive.py!
 
    
 
    You get a fully sandboxed interpreter, in its own filesystem hierarchy
 (try os.listdir('/')).  For example, you would run an untrusted
 script as follows:
    
-
    mkdir virtualtmp
-cp untrusted.py virtualtmp/
-pypy_interact.py --tmp=virtualtmp pypy-sandbox /tmp/untrusted.py
+
    mkdir virtualtmp
+cp untrusted.py virtualtmp/
+pypy_interact.py --tmp=virtualtmp pypy-sandbox /tmp/untrusted.py
 
    
 
    Note that the path /tmp/untrusted.py is a path inside the sandboxed
 filesystem.  You don't have to put untrusted.py in the real /tmp
@@ -180,7 +180,7 @@
     
 
    
diff --git a/public/index.html b/public/index.html
--- a/public/index.html
+++ b/public/index.html
@@ -20,15 +20,12 @@
 
 
 
-
 
 
 
@@ -75,25 +72,20 @@
 
         
     
    
-    
    
-
    
+    
    
 
    
 PyPy logo
    A fast, compliant alternative implementation of Python
    
 
    Get Started : Download and install
    
 
    What is PyPy : Features
    
 
    Documentation (external link)
    
-
    
-
    
-
    On average, PyPy is 4.4 times faser than CPython
    
-
    
-PyPy vs. Python speed comparison graph"
    PyPy trunk (with JIT) benchmark times normalized to CPython. Smaller is
-better. Based on he geometric average of all benchmarks
    
-
    
-
    
-
    
 
    "If you want your code to run faster,
 you should probably just use PyPy."
 -- Guido van Rossum (creator of Python)
    
+
    On average, PyPy is 4.4 times faster than CPython
    
+
    
+PyPy vs. Python speed comparison graph"
    PyPy trunk (with JIT) benchmark times normalized to CPython. Smaller is
+better. Based on the geometric average of all benchmarks
    
+
    
 
    Advantages and distinct Features
    
 
      
 
    • Speed: thanks to its Just-in-Time compiler, Python programs
@@ -108,11 +100,12 @@
 
    • As well as other features.
      • 
 
    
 
    
+
    
     
    
     
 
diff --git a/public/index.rst b/public/index.rst
--- a/public/index.rst
+++ b/public/index.rst
@@ -34,32 +34,22 @@
 .. _`What is PyPy`: features.html
 .. _`Documentation`: https://doc.pypy.org
 
-.. raw:: html
 
-    
-    
    
+::
 
-.. class:: small
+    "If you want your code to run faster,
+    you should probably just use PyPy."
+    -- Guido van Rossum (creator of Python)
 
-On average, PyPy is **4.4 times faser** than CPython
+On average, PyPy is **4.4 times faster** than CPython
 
 .. figure:: images/pypy_speed_graph.png
     :alt: PyPy vs. Python speed comparison graph"
     :figclass: text-sm
 
     PyPy trunk (with JIT) benchmark times normalized to CPython. Smaller is
-    better. Based on he geometric average of all benchmarks
+    better. Based on the geometric average of all benchmarks
 
-.. raw:: html
-
-    
    
-    
-
-::
-
-    "If you want your code to run faster,
-    you should probably just use PyPy."
-    -- Guido van Rossum (creator of Python)
 
 **Advantages and distinct Features**
 
diff --git a/public/people.html b/public/people.html
--- a/public/people.html
+++ b/public/people.html
@@ -188,7 +188,7 @@
     
 
diff --git a/public/performance.html b/public/performance.html
--- a/public/performance.html
+++ b/public/performance.html
@@ -235,13 +235,13 @@
 
    
 
    String concatenation is expensive
    
 
    In CPython, you may want to replace:
    
-
    s = head + body + maybe + tail
+
    s = head + body + maybe + tail
 
    
 
    with the admittedly less readable:
    
-
    s = "%(head)s%(body)s%(maybe)s%(tail)s" % locals()
+
    s = "%(head)s%(body)s%(maybe)s%(tail)s" % locals()
 
    
 
    or even:
    
-
    s = "{head}{body}{maybe}{tail}".format(**locals())
+
    s = "{head}{body}{maybe}{tail}".format(**locals())
 
    
 
    Both of the latter forms avoid multiple-allocation overhead.
 But PyPy's JIT makes the overhead of intermediate concatenations
@@ -249,8 +249,8 @@
 small, bound and constant.  (And locals() is rather slow
 with PyPy's JIT.)
    
 
    On the other hand, in code like this with a string-valued foo() function:
    
-
    for x in mylist:
-    s += foo(x)
+
    for x in mylist:
+    s += foo(x)
 
    
 
    the JIT cannot optimize out intermediate copies.  This code is
 actually quadratic in the total size of the mylist strings due to
@@ -258,10 +258,10 @@
 is always fine for bytearrays, because in this case += is an
 in-place operation.)
    
 
    This:
    
-
    parts = []
-for x in mylist:
-    parts.append(foo(x))
-s = "".join(parts)
+
    parts = []
+for x in mylist:
+    parts.append(foo(x))
+s = "".join(parts)
 
    
 
    can be much faster because all the string concatenation in the last
 line creates exactly one new string object with one C-level copy
@@ -373,7 +373,7 @@
     
 
    
diff --git a/public/rss.xml b/public/rss.xml
--- a/public/rss.xml
+++ b/public/rss.xml
@@ -1,2 +1,2 @@
 
-PyPyhttps://www.pypy.org/A Faster PythonenContents © 2019 <a href="mailto:pypy-dev at pypy.org">The PyPy Team</a> Mon, 30 Dec 2019 07:43:17 GMTNikola (getnikola.com)http://blogs.law.harvard.edu/tech/rss
\ No newline at end of file
+PyPyhttps://www.pypy.org/A Faster PythonenContents © 2020 <a href="mailto:pypy-dev at pypy.org">The PyPy Team</a> Wed, 08 Jan 2020 08:33:50 GMTNikola (getnikola.com)http://blogs.law.harvard.edu/tech/rss
\ No newline at end of file
diff --git a/public/sitemap.xml b/public/sitemap.xml
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -7,42 +7,42 @@
                         http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
  
   https://www.pypy.org/
-  2019-12-30T13:22:00Z
+  2020-01-08T08:35:00Z
  
  
   https://www.pypy.org/archive.html
-  2019-12-30T13:28:00Z
+  2020-01-08T08:33:00Z
  
  
   https://www.pypy.org/blog/
-  2019-12-30T07:43:00Z
+  2020-01-08T05:16:00Z
  
  
   https://www.pypy.org/categories/
-  2019-12-30T07:43:00Z
+  2020-01-08T05:16:00Z
  
  
   https://www.pypy.org/compat.html
-  2019-12-30T13:28:00Z
+  2020-01-08T08:33:00Z
  
  
   https://www.pypy.org/contact.html
-  2019-12-30T13:28:00Z
+  2020-01-08T08:33:00Z
  
  
   https://www.pypy.org/download.html
-  2019-12-30T13:28:00Z
+  2020-01-08T08:33:00Z
  
  
   https://www.pypy.org/features.html
-  2019-12-30T13:28:00Z
+  2020-01-08T08:33:00Z
  
  
   https://www.pypy.org/people.html
-  2019-12-30T13:28:00Z
+  2020-01-08T08:33:00Z
  
  
   https://www.pypy.org/performance.html
-  2019-12-30T13:28:00Z
+  2020-01-08T08:33:00Z
  
 
\ No newline at end of file
diff --git a/public/sitemapindex.xml b/public/sitemapindex.xml
--- a/public/sitemapindex.xml
+++ b/public/sitemapindex.xml
@@ -7,10 +7,10 @@
                         http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
  
   https://www.pypy.org/rss.xml
-  2019-12-30T07:43:00Z
+  2020-01-08T08:33:00Z
  
  
   https://www.pypy.org/sitemap.xml
-  2019-12-30T13:28:00Z
+  2020-01-08T08:35:00Z
  
 
\ No newline at end of file

From pypy.commits at gmail.com  Wed Jan  8 06:50:13 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 03:50:13 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: implement error message improvement of
 CPython
Message-ID: <5e15c1f5.1c69fb81.13221.00ae@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98485:a4a502d7215c
Date: 2020-01-08 12:31 +0100
http://bitbucket.org/pypy/pypy/changeset/a4a502d7215c/

Log:	implement error message improvement of CPython

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -918,11 +918,23 @@
                         w_obj.getclass(self))
         return w_obj
 
+    def _iter_unpackiterable(self, w_iterable):
+        try:
+            return self.iter(w_iterable)
+        except OperationError as e:
+            if e.got_any_traceback():
+                raise
+            if not e.match(self, self.w_TypeError):
+                raise
+            raise oefmt(self.w_TypeError,
+                    "cannot unpack non-iterable %T object",
+                    w_iterable)
+
     def unpackiterable(self, w_iterable, expected_length=-1):
         """Unpack an iterable into a real (interpreter-level) list.
 
         Raise an OperationError(w_ValueError) if the length is wrong."""
-        w_iterator = self.iter(w_iterable)
+        w_iterator = self._iter_unpackiterable(w_iterable)
         if expected_length == -1:
             if self.is_generator(w_iterator):
                 # special hack for speed
@@ -999,7 +1011,7 @@
         # Like unpackiterable(), but for the cases where we have
         # an expected_length and want to unroll when JITted.
         # Returns a fixed-size list.
-        w_iterator = self.iter(w_iterable)
+        w_iterator = self._iter_unpackiterable(w_iterable)
         assert expected_length != -1
         return self._unpackiterable_known_length_jitlook(w_iterator,
                                                          expected_length)
diff --git a/pypy/interpreter/test/test_interpreter.py b/pypy/interpreter/test/test_interpreter.py
--- a/pypy/interpreter/test/test_interpreter.py
+++ b/pypy/interpreter/test/test_interpreter.py
@@ -516,3 +516,13 @@
         else:
             assert False, "Expected ValueError"
             """
+
+    def test_errormsg_unpacking(self):
+        with raises(TypeError) as excinfo:
+            a, b, c = 1
+        assert str(excinfo.value) == "cannot unpack non-iterable int object"
+
+        with raises(TypeError) as excinfo:
+            for a, b in range(10):
+                pass
+        assert str(excinfo.value) == "cannot unpack non-iterable int object"

From pypy.commits at gmail.com  Wed Jan  8 06:50:15 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 03:50:15 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: add repr to frames
Message-ID: <5e15c1f7.1c69fb81.963ca.048e@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98486:628cfb318d11
Date: 2020-01-08 12:49 +0100
http://bitbucket.org/pypy/pypy/changeset/628cfb318d11/

Log:	add repr to frames

diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -951,6 +951,12 @@
             self.space, operr, self, self.last_instr)
         raise operr
 
+    def descr_repr(self, space):
+        code = self.pycode
+        moreinfo = ", file '%s', line %s, code %s" % (
+            code.co_filename, self.get_last_lineno(), code.co_name)
+        return self.getrepr(space, "frame", moreinfo)
+
 # ____________________________________________________________
 
 def get_block_class(opname):
diff --git a/pypy/interpreter/test/test_pyframe.py b/pypy/interpreter/test/test_pyframe.py
--- a/pypy/interpreter/test/test_pyframe.py
+++ b/pypy/interpreter/test/test_pyframe.py
@@ -111,3 +111,12 @@
         assert res == 2
         if hasattr(self, "check_no_w_locals"): # not appdirect
             assert self.check_no_w_locals(fh.frame)
+
+    def test_repr(self):
+        import sys
+        def a_name(a, b, c):
+            a + b + c
+            return sys._getframe()
+        frame = a_name(5, 6, 4)
+        r = repr(frame)
+        assert "a_name" in r
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -658,6 +658,7 @@
     f_code = GetSetProperty(PyFrame.fget_code),
     f_locals = GetSetProperty(PyFrame.fget_getdictscope),
     f_globals = GetSetProperty(PyFrame.fget_w_globals),
+    __repr__ = interp2app(PyFrame.descr_repr),
 )
 assert not PyFrame.typedef.acceptable_as_base_class  # no __new__
 

From pypy.commits at gmail.com  Wed Jan  8 07:48:11 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 04:48:11 -0800 (PST)
Subject: [pypy-commit] pypy default: move test_nestedscope.py to
 apptest_nestedscope.py
Message-ID: <5e15cf8b.1c69fb81.983e2.055e@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98487:aeecc116648d
Date: 2020-01-08 12:56 +0100
http://bitbucket.org/pypy/pypy/changeset/aeecc116648d/

Log:	move test_nestedscope.py to apptest_nestedscope.py

diff --git a/pypy/interpreter/test/test_nestedscope.py b/pypy/interpreter/test/apptest_nestedscope.py
rename from pypy/interpreter/test/test_nestedscope.py
rename to pypy/interpreter/test/apptest_nestedscope.py
--- a/pypy/interpreter/test/test_nestedscope.py
+++ b/pypy/interpreter/test/apptest_nestedscope.py
@@ -1,137 +1,135 @@
+from pytest import raises
 
+def test_nested_scope():
+    x = 42
+    def f(): return x
+    assert f() == 42
 
-class AppTestNestedScope:
+def test_nested_scope2():
+    x = 42
+    y = 3
+    def f(): return x
+    assert f() == 42
 
-    def test_nested_scope(self):
-        x = 42
-        def f(): return x
-        assert f() == 42
+def test_nested_scope3():
+    x = 42
+    def f():
+        def g():
+            return x
+        return g
+    assert f()() == 42
 
-    def test_nested_scope2(self):
-        x = 42
-        y = 3
-        def f(): return x
-        assert f() == 42
+def test_nested_scope4():
+    def f():
+        x = 3
+        def g():
+            return x
+        a = g()
+        x = 4
+        b = g()
+        return (a, b)
+    assert f() == (3, 4)
 
-    def test_nested_scope3(self):
-        x = 42
-        def f():
-            def g():
-                return x
-            return g
-        assert f()() == 42
+def test_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            i = x
+            return locals()
+        return g()
+    d = f()
+    assert d == {'i':3, 'x':3}
 
-    def test_nested_scope4(self):
-        def f():
-            x = 3
-            def g():
-                return x
-            a = g()
-            x = 4
-            b = g()
-            return (a, b)
-        assert f() == (3, 4)
-
-    def test_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
+def test_deeply_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            def h():
                 i = x
                 return locals()
-            return g()
-        d = f()
-        assert d == {'i':3, 'x':3}
+            return locals(), h()
+        return g()
+    outer_locals, inner_locals = f()
+    assert inner_locals == {'i':3, 'x':3}
+    keys = outer_locals.keys()
+    keys.sort()
+    assert keys == ['h', 'x']
 
-    def test_deeply_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
-                def h():
-                    i = x
-                    return locals()
-                return locals(), h()
-            return g()
-        outer_locals, inner_locals = f()
-        assert inner_locals == {'i':3, 'x':3}
-        keys = outer_locals.keys()
-        keys.sort()
-        assert keys == ['h', 'x']
+def test_lambda_in_genexpr():
+    assert eval('map(apply, (lambda: t for t in range(10)))') == range(10)
 
-    def test_lambda_in_genexpr(self):
-        assert eval('map(apply, (lambda: t for t in range(10)))') == range(10)
+def test_cell_repr():
+    import re
+    from repr import repr as r # Don't shadow builtin repr
 
-    def test_cell_repr(self):
-        import re
-        from repr import repr as r # Don't shadow builtin repr
+    def get_cell():
+        x = 42
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+    assert re.match(r'', r(x))
 
-        def get_cell():
+    def get_cell():
+        if False:
             x = 42
-            def inner():
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+
+def test_cell_contents():
+    def f(x):
+        def f(y):
+            return x + y
+        return f
+
+    g = f(10)
+    assert g.func_closure[0].cell_contents == 10
+
+def test_empty_cell_contents():
+
+    def f():
+        def f(y):
+            return x + y
+        return f
+        x = 1
+
+    g = f()
+    with raises(ValueError):
+        g.func_closure[0].cell_contents
+
+def test_compare_cells():
+    def f(n):
+        if n:
+            x = 42
+        def f(y):
+            return x + y
+        return f
+
+    g0 = f(0).func_closure[0]
+    g1 = f(1).func_closure[0]
+    assert cmp(g0, g1) == -1
+
+def test_leaking_class_locals():
+    def f(x):
+        class X:
+            x = 12
+            def f(self):
                 return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
-        assert re.match(r'', r(x))
+            locals()
+        return X
+    assert f(1).x == 12
 
-        def get_cell():
-            if False:
-                x = 42
-            def inner():
-                return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
-
-    def test_cell_contents(self):
-        def f(x):
-            def f(y):
-                return x + y
-            return f
-
-        g = f(10)
-        assert g.func_closure[0].cell_contents == 10
-
-    def test_empty_cell_contents(self):
-
-        def f():
-            def f(y):
-                return x + y
-            return f
-            x = 1
-
-        g = f()
-        with raises(ValueError):
-            g.func_closure[0].cell_contents
-
-    def test_compare_cells(self):
-        def f(n):
-            if n:
-                x = 42
-            def f(y):
-                return x + y
-            return f
-
-        g0 = f(0).func_closure[0]
-        g1 = f(1).func_closure[0]
-        assert cmp(g0, g1) == -1
-
-    def test_leaking_class_locals(self):
-        def f(x):
-            class X:
-                x = 12
-                def f(self):
-                    return x
-                locals()
-            return X
-        assert f(1).x == 12
-
-    def test_nested_scope_locals_mutating_cellvars(self):
-        def f():
-            x = 12
-            def m():
-                locals()
-                x
-                locals()
-                return x
-            return m
-        assert f()() == 12
+def test_nested_scope_locals_mutating_cellvars():
+    def f():
+        x = 12
+        def m():
+            locals()
+            x
+            locals()
+            return x
+        return m
+    assert f()() == 12

From pypy.commits at gmail.com  Wed Jan  8 07:48:12 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 04:48:12 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: merge default
Message-ID: <5e15cf8c.1c69fb81.d6f82.37c1@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98488:966e088ca813
Date: 2020-01-08 13:04 +0100
http://bitbucket.org/pypy/pypy/changeset/966e088ca813/

Log:	merge default

diff too long, truncating to 2000 out of 2009 lines

diff --git a/pypy/interpreter/test/test_nestedscope.py b/pypy/interpreter/test/apptest_nestedscope.py
rename from pypy/interpreter/test/test_nestedscope.py
rename to pypy/interpreter/test/apptest_nestedscope.py
--- a/pypy/interpreter/test/test_nestedscope.py
+++ b/pypy/interpreter/test/apptest_nestedscope.py
@@ -1,171 +1,169 @@
+from pytest import raises
 
+def test_nested_scope():
+    x = 42
+    def f(): return x
+    assert f() == 42
 
-class AppTestNestedScope:
+def test_nested_scope2():
+    x = 42
+    y = 3
+    def f(): return x
+    assert f() == 42
 
-    def test_nested_scope(self):
-        x = 42
-        def f(): return x
-        assert f() == 42
+def test_nested_scope3():
+    x = 42
+    def f():
+        def g():
+            return x
+        return g
+    assert f()() == 42
 
-    def test_nested_scope2(self):
-        x = 42
-        y = 3
-        def f(): return x
-        assert f() == 42
+def test_nested_scope4():
+    def f():
+        x = 3
+        def g():
+            return x
+        a = g()
+        x = 4
+        b = g()
+        return (a, b)
+    assert f() == (3, 4)
 
-    def test_nested_scope3(self):
-        x = 42
-        def f():
-            def g():
-                return x
-            return g
-        assert f()() == 42
+def test_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            i = x
+            return locals()
+        return g()
+    d = f()
+    assert d == {'i':3, 'x':3}
 
-    def test_nested_scope4(self):
-        def f():
-            x = 3
-            def g():
-                return x
-            a = g()
-            x = 4
-            b = g()
-            return (a, b)
-        assert f() == (3, 4)
-
-    def test_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
+def test_deeply_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            def h():
                 i = x
                 return locals()
-            return g()
-        d = f()
-        assert d == {'i':3, 'x':3}
+            return locals(), h()
+        return g()
+    outer_locals, inner_locals = f()
+    assert inner_locals == {'i':3, 'x':3}
+    keys = sorted(outer_locals.keys())
+    assert keys == ['h', 'x']
 
-    def test_deeply_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
-                def h():
-                    i = x
-                    return locals()
-                return locals(), h()
-            return g()
-        outer_locals, inner_locals = f()
-        assert inner_locals == {'i':3, 'x':3}
-        keys = sorted(outer_locals.keys())
-        assert keys == ['h', 'x']
+def test_lambda_in_genexpr():
+    assert [x() for x in (lambda: x for x in range(10))] == list(range(10))
 
-    def test_lambda_in_genexpr(self):
-        assert [x() for x in (lambda: x for x in range(10))] == list(range(10))
+def test_cell_repr():
+    import re
+    from reprlib import repr as r # Don't shadow builtin repr
 
-    def test_cell_repr(self):
-        import re
-        from reprlib import repr as r # Don't shadow builtin repr
+    def get_cell():
+        x = 42
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+    assert re.match(r'', r(x))
 
-        def get_cell():
+    def get_cell():
+        if False:
             x = 42
-            def inner():
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+
+def test_cell_contents():
+    def f(x):
+        def f(y):
+            return x + y
+        return f
+
+    g = f(10)
+    assert g.__closure__[0].cell_contents == 10
+
+def test_empty_cell_contents():
+
+    def f():
+        def f(y):
+            return x + y
+        return f
+        x = 1
+
+    g = f()
+    with raises(ValueError):
+        g.__closure__[0].cell_contents
+
+def test_compare_cells():
+    def f(n):
+        if n:
+            x = n
+        def f(y):
+            return x + y
+        return f
+
+    empty_cell_1 = f(0).__closure__[0]
+    empty_cell_2 = f(0).__closure__[0]
+    g1 = f(1).__closure__[0]
+    g2 = f(2).__closure__[0]
+    assert g1 < g2
+    assert g1 <= g2
+    assert g2 > g1
+    assert g2 >= g1
+    assert not g1 == g2
+    assert g1 != g2
+    #
+    assert empty_cell_1 == empty_cell_2
+    assert not empty_cell_1 != empty_cell_2
+    assert empty_cell_1 < g1
+
+def test_leaking_class_locals():
+    def f(x):
+        class X:
+            x = 12
+            def f(self):
                 return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
-        assert re.match(r'', r(x))
+            locals()
+        return X
+    assert f(1).x == 12
 
-        def get_cell():
-            if False:
-                x = 42
-            def inner():
-                return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
+def test_nested_scope_locals_mutating_cellvars():
+    def f():
+        x = 12
+        def m():
+            locals()
+            x
+            locals()
+            return x
+        return m
+    assert f()() == 12
 
-    def test_cell_contents(self):
-        def f(x):
-            def f(y):
-                return x + y
-            return f
 
-        g = f(10)
-        assert g.__closure__[0].cell_contents == 10
+def test_unbound_local_after_del():
+    """
+    # #4617: It is now legal to delete a cell variable.
+    # The following functions must obviously compile,
+    # and give the correct error when accessing the deleted name.
+    def errorInOuter():
+        y = 1
+        del y
+        print(y)
+        def inner():
+            return y
 
-    def test_empty_cell_contents(self):
+    def errorInInner():
+        def inner():
+            return y
+        y = 1
+        del y
+        inner()
 
-        def f():
-            def f(y):
-                return x + y
-            return f
-            x = 1
-
-        g = f()
-        with raises(ValueError):
-            g.__closure__[0].cell_contents
-
-    def test_compare_cells(self):
-        def f(n):
-            if n:
-                x = n
-            def f(y):
-                return x + y
-            return f
-
-        empty_cell_1 = f(0).__closure__[0]
-        empty_cell_2 = f(0).__closure__[0]
-        g1 = f(1).__closure__[0]
-        g2 = f(2).__closure__[0]
-        assert g1 < g2
-        assert g1 <= g2
-        assert g2 > g1
-        assert g2 >= g1
-        assert not g1 == g2
-        assert g1 != g2
-        #
-        assert empty_cell_1 == empty_cell_2
-        assert not empty_cell_1 != empty_cell_2
-        assert empty_cell_1 < g1
-
-    def test_leaking_class_locals(self):
-        def f(x):
-            class X:
-                x = 12
-                def f(self):
-                    return x
-                locals()
-            return X
-        assert f(1).x == 12
-
-    def test_nested_scope_locals_mutating_cellvars(self):
-        def f():
-            x = 12
-            def m():
-                locals()
-                x
-                locals()
-                return x
-            return m
-        assert f()() == 12
-
-
-    def test_unbound_local_after_del(self):
-        """
-        # #4617: It is now legal to delete a cell variable.
-        # The following functions must obviously compile,
-        # and give the correct error when accessing the deleted name.
-        def errorInOuter():
-            y = 1
-            del y
-            print(y)
-            def inner():
-                return y
-
-        def errorInInner():
-            def inner():
-                return y
-            y = 1
-            del y
-            inner()
-
-        raises(UnboundLocalError, "errorInOuter()")
-        raises(NameError, "errorInInner()")
-        """
+    raises(UnboundLocalError, "errorInOuter()")
+    raises(NameError, "errorInInner()")
+    """
diff --git a/rpython/rlib/unicodedata/generate_unicodedb.py b/rpython/rlib/unicodedata/generate_unicodedb.py
--- a/rpython/rlib/unicodedata/generate_unicodedb.py
+++ b/rpython/rlib/unicodedata/generate_unicodedb.py
@@ -538,7 +538,7 @@
         print >> outfile, '}'
 
 
-def writeUnicodedata(version, table, outfile, base):
+def writeUnicodedata(version, version_tuple, table, outfile, base):
     if base:
         print >> outfile, 'import %s as base_mod' % base
         base_mod = __import__(base)
@@ -549,38 +549,47 @@
     print >> outfile, 'version = %r' % version
     print >> outfile
 
-    if version < "4.1":
+    if version_tuple < (4, 1, 0):
         cjk_interval = ("(0x3400 <= code <= 0x4DB5 or"
                         " 0x4E00 <= code <= 0x9FA5 or"
                         " 0x20000 <= code <= 0x2A6D6)")
-    elif version < "5":    # don't know the exact limit
+    elif version_tuple < (5, 0, 0):    # don't know the exact limit
         cjk_interval = ("(0x3400 <= code <= 0x4DB5 or"
                         " 0x4E00 <= code <= 0x9FBB or"
                         " 0x20000 <= code <= 0x2A6D6)")
-    elif version < "6":
+    elif version_tuple < (6, 0, 0):
         cjk_interval = ("(0x3400 <= code <= 0x4DB5 or"
                         " 0x4E00 <= code <= 0x9FCB or"
                         " 0x20000 <= code <= 0x2A6D6 or"
                         " 0x2A700 <= code <= 0x2B734)")
-    elif version < "6.1":
+    elif version_tuple < (6, 1, 0):
         cjk_interval = ("(0x3400 <= code <= 0x4DB5 or"
                         " 0x4E00 <= code <= 0x9FCB or"
                         " 0x20000 <= code <= 0x2A6D6 or"
                         " 0x2A700 <= code <= 0x2B734 or"
                         " 0x2B740 <= code <= 0x2B81D)")
-    elif version < "8":
+    elif version_tuple < (8, 0, 0):
         cjk_interval = ("(0x3400 <= code <= 0x4DB5 or"
                         " 0x4E00 <= code <= 0x9FCC or"
                         " 0x20000 <= code <= 0x2A6D6 or"
                         " 0x2A700 <= code <= 0x2B734 or"
                         " 0x2B740 <= code <= 0x2B81D)")
-    else:
+    elif version_tuple == (9, 0, 0):
         cjk_interval = ("(0x3400 <= code <= 0x4DB5 or"
                         " 0x4E00 <= code <= 0x9FD5 or"
                         " 0x20000 <= code <= 0x2A6D6 or"
                         " 0x2A700 <= code <= 0x2B734 or"
                         " 0x2B740 <= code <= 0x2B81D or"
                         " 0x2B820 <= code <= 0x2CEA1)")
+    elif version_tuple == (11, 0, 0):
+        cjk_interval = ("(0x3400 <= code <= 0x4DB5 or"
+                        " 0x4E00 <= code <= 0x9FEF or"
+                        " 0x20000 <= code <= 0x2A6D6 or"
+                        " 0x2A700 <= code <= 0x2B734 or"
+                        " 0x2B740 <= code <= 0x2B81D or"
+                        " 0x2B820 <= code <= 0x2CEA1)")
+    else:
+        raise ValueError("please look up CJK ranges and fix the script, e.g. here: https://en.wikipedia.org/wiki/CJK_Unified_Ideographs_(Unicode_block)")
 
     write_character_names(outfile, table, base_mod)
 
@@ -977,7 +986,8 @@
         named_sequences = 'NamedSequences-%(version)s.txt',
         casefolding = 'CaseFolding-%(version)s.txt',
     )
-    if options.unidata_version > '5':
+    version_tuple = tuple(int(x) for x in options.unidata_version.split("."))
+    if version_tuple[0] > 5:
         filenames['special_casing'] = 'SpecialCasing-%(version)s.txt'
     filenames = dict((name, filename % dict(version=options.unidata_version))
                      for (name, filename) in filenames.items())
@@ -985,7 +995,7 @@
                  for (name, filename) in filenames.items())
 
     table = read_unicodedata(files)
-    table.upper_lower_from_properties = (options.unidata_version >= '6')
+    table.upper_lower_from_properties = (version_tuple[0] >= 6)
     print >> outfile, '# UNICODE CHARACTER DATABASE'
     print >> outfile, '# This file was generated with the command:'
     print >> outfile, '#    ', ' '.join(sys.argv)
@@ -993,7 +1003,7 @@
     print >> outfile, 'from rpython.rlib.rarithmetic import r_longlong'
     print >> outfile
     print >> outfile
-    writeUnicodedata(options.unidata_version, table, outfile, options.base)
+    writeUnicodedata(options.unidata_version, version_tuple, table, outfile, options.base)
 
 if __name__ == '__main__':
     main()
diff --git a/rpython/rlib/unicodedata/test/test_ucd.py b/rpython/rlib/unicodedata/test/test_ucd.py
--- a/rpython/rlib/unicodedata/test/test_ucd.py
+++ b/rpython/rlib/unicodedata/test/test_ucd.py
@@ -1,5 +1,6 @@
+import pytest
 from rpython.rlib.runicode import code_to_unichr, MAXUNICODE
-from rpython.rlib.unicodedata import unicodedb_5_2_0
+from rpython.rlib.unicodedata import unicodedb_5_2_0, unicodedb_11_0_0
 from rpython.rtyper.test.tool import BaseRtypingTest
 from rpython.translator.c.test.test_genc import compile
 
@@ -26,3 +27,26 @@
         assert got == 0xd808    # first char of a pair
     else:
         assert got == 0x12346
+
+def test_cjk():
+    cases = [
+        ('3400', '4DB5'),
+        ('4E00', '9FEF'),
+        ('20000', '2A6D6'),
+        ('2A700', '2B734'),
+        ('2B740', '2B81D'),
+        ('2B820', '2CEA1'),
+    ]
+    for first, last in cases:
+        first = int(first, 16)
+        last = int(last, 16)
+        # Test at and inside the boundary
+        for i in (first, first + 1, last - 1, last):
+            charname = 'CJK UNIFIED IDEOGRAPH-%X'%i
+            assert unicodedb_11_0_0.lookup(charname) == i
+        # Test outside the boundary
+        for i in first - 1, last + 1:
+            charname = 'CJK UNIFIED IDEOGRAPH-%X'%i
+            with pytest.raises(KeyError):
+                unicodedb_11_0_0.lookup(charname)
+
diff --git a/rpython/rlib/unicodedata/unicodedb_11_0_0.py b/rpython/rlib/unicodedata/unicodedb_11_0_0.py
--- a/rpython/rlib/unicodedata/unicodedb_11_0_0.py
+++ b/rpython/rlib/unicodedata/unicodedb_11_0_0.py
@@ -61172,7 +61172,7 @@
         if not ('0' <= c <= '9' or 'A' <= c <= 'F'):
             raise KeyError
     code = int(cjk_code, 16)
-    if (0x3400 <= code <= 0x4DB5 or 0x4E00 <= code <= 0x9FA5 or 0x20000 <= code <= 0x2A6D6):
+    if (0x3400 <= code <= 0x4DB5 or 0x4E00 <= code <= 0x9FEF or 0x20000 <= code <= 0x2A6D6 or 0x2A700 <= code <= 0x2B734 or 0x2B740 <= code <= 0x2B81D or 0x2B820 <= code <= 0x2CEA1):
         return code
     raise KeyError
 
@@ -61197,7 +61197,7 @@
     return code
 
 def name(code):
-    if (0x3400 <= code <= 0x4DB5 or 0x4E00 <= code <= 0x9FA5 or 0x20000 <= code <= 0x2A6D6):
+    if (0x3400 <= code <= 0x4DB5 or 0x4E00 <= code <= 0x9FEF or 0x20000 <= code <= 0x2A6D6 or 0x2A700 <= code <= 0x2B734 or 0x2B740 <= code <= 0x2B81D or 0x2B820 <= code <= 0x2CEA1):
         return "CJK UNIFIED IDEOGRAPH-" + hex(code)[2:].upper()
     if 0xAC00 <= code <= 0xD7A3:
         # vl_code, t_code = divmod(code - 0xAC00, len(_hangul_T))
@@ -61255,10 +61255,12 @@
 ('Ll', 'R', 'N', 7202),
 ('Lm', 'AL', 'N', 15362),
 ('Lm', 'L', 'A', 15362),
+('Lm', 'L', 'A', 15394),
 ('Lm', 'L', 'H', 14338),
 ('Lm', 'L', 'H', 15362),
-('Lm', 'L', 'N', 12290),
+('Lm', 'L', 'N', 12322),
 ('Lm', 'L', 'N', 15362),
+('Lm', 'L', 'N', 15394),
 ('Lm', 'L', 'W', 15362),
 ('Lm', 'ON', 'A', 15362),
 ('Lm', 'ON', 'N', 12290),
@@ -61266,7 +61268,7 @@
 ('Lm', 'R', 'N', 15362),
 ('Lo', 'AL', 'N', 4098),
 ('Lo', 'AL', 'N', 7170),
-('Lo', 'L', 'A', 7170),
+('Lo', 'L', 'A', 7202),
 ('Lo', 'L', 'H', 7170),
 ('Lo', 'L', 'N', 6146),
 ('Lo', 'L', 'N', 7170),
@@ -61284,6 +61286,7 @@
 ('Me', 'NSM', 'N', 12288),
 ('Mn', 'L', 'N', 14336),
 ('Mn', 'NSM', 'A', 14336),
+('Mn', 'NSM', 'A', 14368),
 ('Mn', 'NSM', 'N', 14336),
 ('Mn', 'NSM', 'N', 15360),
 ('Mn', 'NSM', 'W', 14336),
@@ -61293,8 +61296,11 @@
 ('Nd', 'EN', 'Na', 6592),
 ('Nd', 'L', 'N', 6592),
 ('Nd', 'R', 'N', 6592),
-('Nl', 'L', 'A', 7232),
+('Nl', 'L', 'A', 7240),
+('Nl', 'L', 'A', 7264),
 ('Nl', 'L', 'N', 7232),
+('Nl', 'L', 'N', 7240),
+('Nl', 'L', 'N', 7264),
 ('Nl', 'L', 'W', 7232),
 ('Nl', 'ON', 'N', 7232),
 ('No', 'AL', 'N', 4160),
@@ -61417,6 +61423,8 @@
 ('So', 'ET', 'N', 4096),
 ('So', 'ET', 'N', 7168),
 ('So', 'L', 'A', 4096),
+('So', 'L', 'A', 4104),
+('So', 'L', 'A', 4128),
 ('So', 'L', 'N', 4096),
 ('So', 'L', 'W', 4096),
 ('So', 'ON', 'A', 4096),
@@ -61505,350 +61513,350 @@
 'WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW\xb6'
 )
 _db_pages = ( 
-'\x01\x01\x01\x01\x01\x01\x01\x01\x01\x02\x00\x03\x04\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x00\x00\x00\x02\xd1\x8c\x8c\x81\x9e\x81\x8c\x8d\x96k\x8c\xacza{zCCCCCCCCCC{\x8c\xba\xb9\xba\x8c'
-'\x8c66666666666666666666666666\x96\x8ck\xa6^\xa6\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x96\xb9k\xb9\x01'
-'\x01\x01\x01\x01\x01\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xce\x84\x9e\x9e\x9a\x9e\xc9\x84\xa3\xc7+t\xb9\x07\xc4\xa6\xbe\xaeNN\xa3\x1b\x84\x86\xa3N+pUUU\x84'
-'55555535555555553555555\xb13555553\x19\x19\x19\x1b\x1b\x1b\x1b\x19\x1b\x19\x19\x19\x1b\x19\x19\x1b\x1b\x19\x1b\x19\x19\x1b\x1b\x1b\xb1\x19\x19\x19\x1b\x19\x1b\x19\x1b'
-'5\x195\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x195\x195\x1b5\x1b5\x1b5\x195\x1b5\x1b5\x1b5\x1b5\x1b3\x195\x1b5\x195\x1b5\x1b5\x193\x195\x1b5\x1b\x195\x1b5\x1b5\x1b3'
-'\x193\x195\x195\x1b5\x19\x193\x195\x195\x1b5\x1b3\x195\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b3\x195\x1b5\x195\x1b5\x1b5\x1b5\x1b5\x1b5\x1b55\x1b5\x1b5\x1b\x1b'
-'\x1b55\x1b5\x1b55\x1b555\x1b\x1b5555\x1b55\x1b555\x1b\x1b\x1b55\x1b55\x1b5\x1b5\x1b55\x1b5\x1b\x1b5\x1b55\x1b555\x1b5\x1b55\x1b\x1b.5\x1b\x1b\x1b'
-'....52\x1b52\x1b52\x1b5\x195\x195\x195\x195\x195\x195\x195\x19\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x1b52\x1b5\x1b555\x1b5\x1b5\x1b5\x1b'
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x1b\x1b\x1b\x1b\x1b\x1b55\x1b55\x1b'
-'\x1b5\x1b5555\x1b5\x1b5\x1b5\x1b5\x1b\x1b\x19\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x19\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-"\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b.\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b#########''#####"
-"##\xa5\xa5\xa3\xa5'%'%%%'%''\x1f#\xa5\xa5\xa5\xa5\xa5\xa5\xa3\xa3\xa3\xa3\xa5\xa3\xa5\xa3#####\xa5\xa5\xa5\xa5\xa5\xa5\xa5'\xa5#\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5"
-'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<'
-'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<5\x1b5\x1b\'\xa55\x1b\x15\x15"\x1b\x1b\x1b\x8a5'
-'\x15\x15\x15\x15\xa5\xa55\x8b555\x155\x1555\x1b33333333333333333\x15333333355\x1b\x1b\x1b\x1b\x1b\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19'
-'\x19\x19\x1b\x19\x19\x19\x19\x19\x19\x19\x1b\x1b\x1b\x1b\x1b5\x1b\x1b555\x1b\x1b\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x1b\x1b\x1b\x1b5\x1b\xb65\x1b55\x1b\x1b555'
-'535555555555555533333333333333333333333333333333\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19'
-'\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x1b\x19\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'5\x1b\xc2=====::5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'55\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x15555555555555555'
-'55555555555555555555555\x15\x15#\x83\x83\x83\x83\x83\x83\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x83d\x15\x15\xc7\xc7\x9d\x15=============================================f='
-'\x90==\x90==\x90=\x15\x15\x15\x15\x15\x15\x15\x15111111111111111111111111111\x15\x15\x15\x151111\x90\x91\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x06\x06\x06\x06\x06\x06\xb6\xb6\xa8\x80\x80\x99yu\xc7\xc7===========u\x05\x15uu********************************'
-'\x1e**********=====================@@@@@@@@@@\x80vvu**=***************'
-'****************************************************************'
-'********************u*=======\x06\xc7======\x1e\x1e==\xc7====**BBBBBBBBBB***\xbd\xbd*'
-'uuuuuuuuuuuuuu\x15\x05*=******************************================'
-'===========\x15\x15***************************************************'
-'**************************************===========*\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'EEEEEEEEEE111111111111111111111111111111111=========((\xc7\x8a\x8a\x8a(\x15\x15=\xa0\xa0'
-'1111111111111111111111====(=========(===(=====\x15\x15\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x15'
-'1111111111111111111111111===\x15\x15\x90\x15***********\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15*********************\x15********\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15===============\x06============================='
-'===8......................................................=8=.88'
-'8========8888=88.=======..........==\x83\x83DDDDDDDDDD\x83#..............'
-'.=88\x15........\x15\x15..\x15\x15......................\x15.......\x15.\x15\x15\x15....\x15\x15=.88'
-'8====\x15\x1588\x15\x1588=.\x15\x15\x15\x15\x15\x15\x15\x158\x15\x15\x15\x15..\x15...==\x15\x15DDDDDDDDDD..\x9d\x9dRRRRRR\xc2\x9d.\x83=\x15'
-'\x15==8\x15......\x15\x15\x15\x15..\x15\x15......................\x15.......\x15..\x15..\x15..\x15\x15=\x1588'
-'8==\x15\x15\x15\x15==\x15\x15===\x15\x15\x15=\x15\x15\x15\x15\x15\x15\x15....\x15.\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDD==...=\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15==8\x15.........\x15...\x15......................\x15.......\x15..\x15.....\x15\x15=.88'
-'8=====\x15==8\x1588=\x15\x15.\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15..==\x15\x15DDDDDDDDDD\x83\x9d\x15\x15\x15\x15\x15\x15\x15.======'
-'\x15=88\x15........\x15\x15..\x15\x15......................\x15.......\x15..\x15.....\x15\x15=.8='
-'8====\x15\x1588\x15\x1588=\x15\x15\x15\x15\x15\x15\x15\x15=8\x15\x15\x15\x15..\x15...==\x15\x15DDDDDDDDDD\xc2.RRRRRR\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15=.\x15......\x15\x15\x15...\x15....\x15\x15\x15..\x15.\x15..\x15\x15\x15..\x15\x15\x15...\x15\x15\x15............\x15\x15\x15\x1588'
-'=88\x15\x15\x15888\x15888=\x15\x15.\x15\x15\x15\x15\x15\x158\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDDRRR\xc7\xc7\xc7\xc7\xc7\xc7\x9d\xc7\x15\x15\x15\x15\x15'
-'=888=........\x15...\x15.......................\x15................\x15\x15\x15.=='
-'=8888\x15===\x15====\x15\x15\x15\x15\x15\x15\x15==\x15...\x15\x15\x15\x15\x15..==\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15\x15\x15WWWWWWW\xc2'
-'.=88\x83........\x15...\x15.......................\x15..........\x15.....\x15\x15=.8;'
-'88888\x15;88\x1588==\x15\x15\x15\x15\x15\x15\x1588\x15\x15\x15\x15\x15\x15\x15.\x15..==\x15\x15DDDDDDDDDD\x15..\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'==88\x15........\x15...\x15.........................................==.88'
-'8====\x15888\x15888=.\xc2\x15\x15\x15\x15...8RRRRRRR...==\x15\x15DDDDDDDDDDRRRRRRRRR\xc2......'
-'\x15\x1588\x15..................\x15\x15\x15........................\x15.........\x15.\x15\x15'
-'.......\x15\x15\x15=\x15\x15\x15\x15888===\x15=\x1588888888\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x1588\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15................................................=.-=======\x15\x15\x15\x15\x9d'
-'......#========\x83DDDDDDDDDD\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15..\x15.\x15\x15..\x15.\x15\x15.\x15\x15\x15\x15\x15\x15....\x15.......\x15...\x15.\x15.\x15\x15..\x15....=.-======\x15==.\x15\x15'
-'.....\x15#\x15======\x15\x15DDDDDDDDDD\x15\x15....\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.\xc2\xc2\xc2\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\xc2\x83\xc2\xc2\xc2==\xc2\xc2\xc2\xc2\xc2\xc2DDDDDDDDDDRRRRRRRRRR\xc2=\xc2=\xc2=\x95j\x95j88'
-'........\x15....................................\x15\x15\x15\x15==============8'
-'=====\x83==.....===========\x15====================================\x15\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2=\xc2\xc2\xc2\xc2\xc2\xc2\x15\xc2\xc2\x83\x83\x83\x83\x83\xc2\xc2\xc2\xc2\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'...........................................88====8======8==88==.'
-'DDDDDDDDDD\x83\x83\x83\x83\x83\x83......88==....===.888..8888888...====...........'
-'..=88==888888=.8DDDDDDDDDD888=\xc2\xc255555555555555555555555555555555'
-'555555\x155\x15\x15\x15\x15\x155\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x83#\x1b\x1b\x1b'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////................................'
-'................................................................'
-'................................................................'
-'................................................................'
-'.........\x15....\x15\x15.......\x15.\x15....\x15\x15................................'
-'.........\x15....\x15\x15.................................\x15....\x15\x15.......\x15'
-'.\x15....\x15\x15...............\x15........................................'
-'.................\x15....\x15\x15........................................'
-'...........................\x15\x15===\x83\x83\x83\x83\x83\x83\x83\x83\x83SSSSSSSSSRRRRRRRRRRR\x15\x15\x15'
-'................\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x1555555555555555555555555555555555'
-'555555555555555555555555555555555555555555555555555555\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15'
-'d...............................................................'
-'................................................................'
-'................................................................'
-'................................................................'
-'................................................................'
-'................................................................'
-'................................................................'
-'................................................................'
-'................................................................'
-'.............................................\x83\x83.................'
-'\xd0..........................\x95j\x15\x15\x15................................'
-'...........................................\x83\x83\x83GGG........\x15\x15\x15\x15\x15\x15\x15'
-'.............\x15....===\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15..................===\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'..................==\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15.............\x15...\x15==\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'....................................................==8=======88'
-'888888=88===========\x83\x83\x83#\x83\x83\x83\x9d.=\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15WWWWWWWWWW\x15\x15\x15\x15\x15\x15'
-'\x8a\x8a\x8a\x8a\x8a\x8ad\x8a\x8a\x8a\x8a===\x08\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15................................'
-'...#.....................................................\x15\x15\x15\x15\x15\x15\x15'
-'.....>>..................................=.\x15\x15\x15\x15\x15................'
-'......................................................\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'...............................\x15===8888==888\x15\x15\x15\x1588=888888===\x15\x15\x15\x15'
-'\xc7\x15\x15\x15\x8a\x8aDDDDDDDDDD..............................\x15\x15.....\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'............................................\x15\x15\x15\x15................'
-'..........\x15\x15\x15\x15\x15\x15DDDDDDDDDDS\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'.......................==88=\x15\x15\x83\x83................................'
-'.....................8=8=======\x15=8=88========888888==========\x15\x15='
-'DDDDDDDDDD\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15\x83\x83\x83\x83\x83\x83\x83#\x83\x83\x83\x83\x83\x83\x15\x15==============:\x15'
+'\x01\x01\x01\x01\x01\x01\x01\x01\x01\x02\x00\x03\x04\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x00\x00\x00\x02\xd9\x92\x92\x87\xa4\x87\x92\x93\x9cq\x92\xb2\x80g\x81\x80FFFFFFFFFF\x81\x92\xc0\xbf\xc0\x92'
+'\x9288888888888888888888888888\x9c\x92q\xacd\xac\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x1c\x9c\xbfq\xbf\x01'
+'\x01\x01\x01\x01\x01\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xd6\x8a\xa4\xa4\xa0\xa4\xd1\x8a\xa9\xcf-z\xbf\x07\xcc\xac\xc4\xb4TT\xa9\x1b\x8a\x8c\xa9T-v[[[\x8a'
+'77777757777777775777777\xb75777775\x19\x19\x19\x1b\x1b\x1b\x1b\x19\x1b\x19\x19\x19\x1b\x19\x19\x1b\x1b\x19\x1b\x19\x19\x1b\x1b\x1b\xb7\x19\x19\x19\x1b\x19\x1b\x19\x1b'
+'7\x197\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x197\x197\x1b7\x1b7\x1b7\x197\x1b7\x1b7\x1b7\x1b7\x1b5\x197\x1b7\x197\x1b7\x1b7\x195\x197\x1b7\x1b\x197\x1b7\x1b7\x1b5'
+'\x195\x197\x197\x1b7\x19\x195\x197\x197\x1b7\x1b5\x197\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b5\x197\x1b7\x197\x1b7\x1b7\x1b7\x1b7\x1b7\x1b77\x1b7\x1b7\x1b\x1b'
+'\x1b77\x1b7\x1b77\x1b777\x1b\x1b7777\x1b77\x1b777\x1b\x1b\x1b77\x1b77\x1b7\x1b7\x1b77\x1b7\x1b\x1b7\x1b77\x1b777\x1b7\x1b77\x1b\x1b07\x1b\x1b\x1b'
+'000074\x1b74\x1b74\x1b7\x197\x197\x197\x197\x197\x197\x197\x19\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x1b74\x1b7\x1b777\x1b7\x1b7\x1b7\x1b'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x1b\x1b\x1b\x1b\x1b\x1b77\x1b77\x1b'
+'\x1b7\x1b7777\x1b7\x1b7\x1b7\x1b7\x1b\x1b\x19\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x19\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b0\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b%%%%%%%%%))$$$$$'
+"%%\xab\xab\xa9\xab)')''')'))\x1f$\xab\xab\xab\xab\xab\xab\xa9\xa9\xa9\xa9\xab\xa9\xab\xa9%%%%%\xab\xab\xab\xab\xab\xab\xab)\xab$\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab"
+'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'
+'>>>>>?>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>7\x1b7\x1b)\xab7\x1b\x15\x15#\x1b\x1b\x1b\x907'
+'\x15\x15\x15\x15\xab\xab7\x91777\x157\x1577\x1b55555555555555555\x15555555577\x1b\x1b\x1b\x1b\x1b\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19'
+'\x19\x19\x1b\x19\x19\x19\x19\x19\x19\x19\x1b\x1b\x1b\x1b\x1b7\x1b\x1b777\x1b\x1b\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x1b\x1b\x1b\x1b7\x1b\xbc7\x1b77\x1b\x1b777'
+'757777777777777755555555555555555555555555555555\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19'
+'\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x19\x1b\x19\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'7\x1b\xca@@@@@<<7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'77\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x15777777777777777'
+'77777777777777777777777\x15\x15$\x89\x89\x89\x89\x89\x89\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x89j\x15\x15\xcf\xcf\xa3\x15@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@l@'
+'\x96@@\x96@@\x96@\x15\x15\x15\x15\x15\x15\x15\x15333333333333333333333333333\x15\x15\x15\x153333\x96\x97\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x06\x06\x06\x06\x06\x06\xbc\xbc\xae\x86\x86\x9f\x7f{\xcf\xcf@@@@@@@@@@@{\x05\x15{{,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+'\x1e,,,,,,,,,,@@@@@@@@@@@@@@@@@@@@@CCCCCCCCCC\x86||{,,@,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,{,@@@@@@@\x06\xcf@@@@@@\x1e\x1e@@\xcf@@@@,,EEEEEEEEEE,,,\xc3\xc3,'
+'{{{{{{{{{{{{{{\x15\x05,@,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,@@@@@@@@@@@@@@@@'
+'@@@@@@@@@@@\x15\x15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,@@@@@@@@@@@,\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'HHHHHHHHHH333333333333333333333333333333333@@@@@@@@@**\xcf\x90\x90\x90*\x15\x15@\xa6\xa6'
+'3333333333333333333333@@@@*@@@@@@@@@*@@@*@@@@@\x15\x15\x96\x96\x96\x96\x96\x96\x96\x96\x96\x96\x96\x96\x96\x96\x96\x15'
+'3333333333333333333333333@@@\x15\x15\x96\x15,,,,,,,,,,,\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15,,,,,,,,,,,,,,,,,,,,,\x15,,,,,,,,\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15@@@@@@@@@@@@@@@\x06@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'
+'@@@:000000000000000000000000000000000000000000000000000000@:@0::'
+':@@@@@@@@::::@::0@@@@@@@0000000000@@\x89\x89GGGGGGGGGG\x89$00000000000000'
+'0@::\x1500000000\x15\x1500\x15\x150000000000000000000000\x150000000\x150\x15\x15\x150000\x15\x15 at 0::'
+':@@@@\x15\x15::\x15\x15::@0\x15\x15\x15\x15\x15\x15\x15\x15:\x15\x15\x15\x1500\x15000@@\x15\x15GGGGGGGGGG00\xa3\xa3XXXXXX\xca\xa30\x89@\x15'
+'\x15@@:\x15000000\x15\x15\x15\x1500\x15\x150000000000000000000000\x150000000\x1500\x1500\x1500\x15\x15@\x15::'
+':@@\x15\x15\x15\x15@@\x15\x15@@@\x15\x15\x15@\x15\x15\x15\x15\x15\x15\x150000\x150\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGG@@000@\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15@@:\x15000000000\x15000\x150000000000000000000000\x150000000\x1500\x1500000\x15\x15 at 0::'
+':@@@@@\x15@@:\x15::@\x15\x150\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1500@@\x15\x15GGGGGGGGGG\x89\xa3\x15\x15\x15\x15\x15\x15\x150@@@@@@'
+'\x15@::\x1500000000\x15\x1500\x15\x150000000000000000000000\x150000000\x1500\x1500000\x15\x15 at 0:@'
+':@@@@\x15\x15::\x15\x15::@\x15\x15\x15\x15\x15\x15\x15\x15@:\x15\x15\x15\x1500\x15000@@\x15\x15GGGGGGGGGG\xca0XXXXXX\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15 at 0\x15000000\x15\x15\x15000\x150000\x15\x15\x1500\x150\x1500\x15\x15\x1500\x15\x15\x15000\x15\x15\x15000000000000\x15\x15\x15\x15::'
+'@::\x15\x15\x15:::\x15:::@\x15\x150\x15\x15\x15\x15\x15\x15:\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGGXXX\xcf\xcf\xcf\xcf\xcf\xcf\xa3\xcf\x15\x15\x15\x15\x15'
+'@:::@00000000\x15000\x1500000000000000000000000\x150000000000000000\x15\x15\x150@@'
+'@::::\x15@@@\x15@@@@\x15\x15\x15\x15\x15\x15\x15@@\x15000\x15\x15\x15\x15\x1500@@\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15\x15\x15]]]]]]]\xca'
+'0@::\x8900000000\x15000\x1500000000000000000000000\x150000000000\x1500000\x15\x15 at 0:='
+':::::\x15=::\x15::@@\x15\x15\x15\x15\x15\x15\x15::\x15\x15\x15\x15\x15\x15\x150\x1500@@\x15\x15GGGGGGGGGG\x1500\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'@@::\x1500000000\x15000\x1500000000000000000000000000000000000000000@@0::'
+':@@@@\x15:::\x15:::@0\xca\x15\x15\x15\x15000:XXXXXXX000@@\x15\x15GGGGGGGGGGXXXXXXXXX\xca000000'
+'\x15\x15::\x15000000000000000000\x15\x15\x15000000000000000000000000\x15000000000\x150\x15\x15'
+'0000000\x15\x15\x15@\x15\x15\x15\x15:::@@@\x15@\x15::::::::\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15::\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15000000000000000000000000000000000000000000000000 at 0/@@@@@@@\x15\x15\x15\x15\xa3'
+'000000$@@@@@@@@\x89GGGGGGGGGG\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x1500\x150\x15\x1500\x150\x15\x150\x15\x15\x15\x15\x15\x150000\x150000000\x15000\x150\x150\x15\x1500\x150000 at 0/@@@@@@\x15@@0\x15\x15'
+'00000\x15$\x15@@@@@@\x15\x15GGGGGGGGGG\x15\x150000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0\xca\xca\xca\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\xca\x89\xca\xca\xca@@\xca\xca\xca\xca\xca\xcaGGGGGGGGGGXXXXXXXXXX\xca@\xca@\xca@\x9bp\x9bp::'
+'00000000\x15000000000000000000000000000000000000\x15\x15\x15\x15@@@@@@@@@@@@@@:'
+'@@@@@\x89@@00000@@@@@@@@@@@\x15@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\x15\xca\xca'
+'\xca\xca\xca\xca\xca\xca@\xca\xca\xca\xca\xca\xca\x15\xca\xca\x89\x89\x89\x89\x89\xca\xca\xca\xca\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000::@@@@:@@@@@@:@@::@@0'
+'GGGGGGGGGG\x89\x89\x89\x89\x89\x89000000::@@0000@@@0:::00:::::::000@@@@00000000000'
+'00@::@@::::::@0:GGGGGGGGGG:::@\xca\xca77777777777777777777777777777777'
+'777777\x157\x15\x15\x15\x15\x157\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x89$\x1b\x1b\x1b'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111100000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'000000000\x150000\x15\x150000000\x150\x150000\x15\x1500000000000000000000000000000000'
+'000000000\x150000\x15\x15000000000000000000000000000000000\x150000\x15\x150000000\x15'
+'0\x150000\x15\x15000000000000000\x150000000000000000000000000000000000000000'
+'00000000000000000\x150000\x15\x150000000000000000000000000000000000000000'
+'000000000000000000000000000\x15\x15@@@\x89\x89\x89\x89\x89\x89\x89\x89\x89YYYYYYYYYXXXXXXXXXXX\x15\x15\x15'
+'0000000000000000\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x1577777777777777777777777777777777'
+'777777777777777777777777777777777777777777777777777777\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15'
+'j000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'000000000000000000000000000000000000000000000\x89\x8900000000000000000'
+'\xd800000000000000000000000000\x9bp\x15\x15\x1500000000000000000000000000000000'
+'0000000000000000000000000000000000000000000\x89\x89\x89KKK00000000\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000\x150000@@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15000000000000000000@@@\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x150000000000000\x15000\x15@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000@@:@@@@@@@::'
+'::::::@::@@@@@@@@@@@\x89\x89\x89$\x89\x89\x89\xa30@\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15]]]]]]]]]]\x15\x15\x15\x15\x15\x15'
+'\x90\x90\x90\x90\x90\x90j\x90\x90\x90\x90@@@\x08\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x1500000000000000000000000000000000'
+'000$00000000000000000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15'
+'00000AA0000000000000000000000000000000000 at 0\x15\x15\x15\x15\x150000000000000000'
+'000000000000000000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000\x15@@@::::@@:::\x15\x15\x15\x15::@::::::@@@\x15\x15\x15\x15'
+'\xcf\x15\x15\x15\x90\x90GGGGGGGGGG000000000000000000000000000000\x15\x1500000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'00000000000000000000000000000000000000000000\x15\x15\x15\x150000000000000000'
+'0000000000\x15\x15\x15\x15\x15\x15GGGGGGGGGGY\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'00000000000000000000000@@::@\x15\x15\x89\x8900000000000000000000000000000000'
+'000000000000000000000:@:@@@@@@@\x15@:@::@@@@@@@@::::::@@@@@@@@@@\x15\x15@'
+'GGGGGGGGGG\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15\x89\x89\x89\x89\x89\x89\x89$\x89\x89\x89\x89\x89\x89\x15\x15@@@@@@@@@@@@@@<\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'====8...............................................=8=====8=888'
-'88=88.......\x15\x15\x15\x15DDDDDDDDDD\x83\x83\x83\x83\x83\x83\x83\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2=========\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\x15\x15\x15'
-'==8..............................8====88==8===..DDDDDDDDDD......'
-'......................................=8==888=8===88\x15\x15\x15\x15\x15\x15\x15\x15\x83\x83\x83\x83'
-'....................................88888888========88==\x15\x15\x15\x83\x83\x83\x83\x83'
-'DDDDDDDDDD\x15\x15\x15...DDDDDDDDDD..............................######\x83\x83'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x15\x15\x155555555555555555555555555555555555555555555\x15\x15555'
-'\x83\x83\x83\x83\x83\x83\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15===\x83=============8=======....=....88=..8==\x15\x15\x15\x15\x15\x15'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b####################'
-'###########################################\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b#\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b#####################################'
-'==========================================================\x15====='
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15555555\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15555555\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x155\x155\x155\x155\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b22222222\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b22222222\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b22222222\x1b\x1b\x1b\x1b\x1b\x15\x1b\x1b55552\xa5\x1b\xa5'
-'\xa5\xa5\x1b\x1b\x1b\x15\x1b\x1b55552\xa5\xa5\xa5\x1b\x1b\x1b\x1b\x15\x15\x1b\x1b5555\x15\xa5\xa5\xa5\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555\xa5\xa5\xa5\x15\x15\x1b\x1b\x1b\x15\x1b\x1b55552\xa5\xa5\x15'
-'\xd0\xd0\xd0\xd0\xd0\xd0\xd0\xd0\xd0\xd0\xd0\x08\x08\x08\n\x11cddccc\x84\x8aro\x94sqn\x94s\x84\x84\x84\x8a\x85\x84\x84\x85\xcc\xcd\x0b\x12\x0f\r\x14\xce~\x80~~\x80\x84\x8a\x8a\x8atp\x84\x8a\x8a\x84]'
-']\x8a\x8a\x8a\xa9\x95j\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\xb6\x8a]\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\xd0\x08\x08\x08\x08\x08\x15\x0c\x13\t\x10\x08\x08\x08\x08\x08\x08P#\x15\x15NPPPPP\xab\xab\xb6\x95j\x1f'
-'PNNNNPPPPP\xab\xab\xb6\x95j\x15#############\x15\x15\x15\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9c\x9d\x9d\x9a\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d\x9d'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15=============::::=:::============\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc75\xc4\xc7\xc4\xc75\xc7\xc4\x1b555\x1b\x1b555\x19\xc75\xc4\xc7\xb855555\xc7\xc7\xc7\xc4\xc4\xc75\xc73\xc75\xc75355\xc0\x1b5555\x1b....\x1b\xc7\xc7\x1b\x1b55'
-'\xb7\xb6\xb6\xb6\xb65\x1b\x1b\x1b\x1b\xc7\xb6\xc7\xc7\x1b\xc2WWWUUWWWWWWUUUUWFFFFFFFFFFFFGGGGFFFFFFFFFFGGGGGG'
-'GGG5\x1bGGGGU\xc7\xc7\x15\x15\x15\x15\xb1\xb1\xb1\xb1\xb1\xc4\xc4\xc4\xc4\xc4\xb6\xb6\xc7\xc7\xc7\xc7\xb6\xc7\xc7\xb6\xc7\xc7\xb6\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xb6\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xb6\xb6\xc7\xc7\xb1\xc7\xb1\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6'
-'\xb1\xb7\xb2\xb2\xb7\xb6\xb6\xb1\xb2\xb7\xb7\xb2\xb7\xb7\xb6\xb1\xb6\xb2\xab\xaf\xb6\xb2\xb7\xb6\xb6\xb6\xb2\xb7\xb7\xb2\xb1\xb2\xb2\xb7\xb7\xb1\xb7\xb1\xb7\xb1\xb1\xb1\xb1\xb2\xb2\xb7\xb2\xb7\xb7\xb7\xb7\xb7\xb1\xb1\xb1\xb1\xb6\xb7\xb6\xb7\xb2\xb2\xb7\xb7'
-'\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb2\xb7\xb7\xb7\xb2\xb6\xb6\xb6\xb6\xb6\xb2\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb2\xb1\xb7\xb6\xb2\xb2\xb2\xb2\xb7\xb7\xb2\xb2\xb6\xb6\xb2\xb2\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7'
-'\xb7\xb7\xb2\xb2\xb7\xb7\xb2\xb2\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb7\xb7\xb7\xb7\xb6\xb6\xb1\xb6\xb6\xb7\xb1\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb6\xb1\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb7\xb2'
-'\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb7\xb7\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x95j\x95j\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xc7\xc7\xc7\xc7\xb7\xb7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x98m\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc7\xb6\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc2\xc7\xc7\xc7\xc7\xc7\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xb6\xb6\xb6\xb6\xb6\xb6\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xc7\xc7\xc7\xca\xc7\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15VVVVVVVVVUUUUUUUUUUUVVVVVVVVVUUU'
-'UUUUUUUUNNNNNNNNNMMMMMMMMMMM\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1'
-'\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1XUUUUUUUUUUVVVVVVVVVUV'
-'\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4'
-'\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc7\xc7\xc7\xc7\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc7\xc7\xc4\xc4\xc4\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xc7\xc4\xb1\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xc7'
-'\xc4\xb1\xc7\xc7\xc7\xc7\xc4\xc4\xc4\xc7\xc7\xc4\xc7\xc7\xc4\xc4\xc4\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc4\xc4\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xb6\xb6\xb6\xb6\xb6\xbb\xbb\xb6'
-'\xc7\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xc7\xc4\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xc7\xc7\xc7\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc7\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc4\xc7\xc4\xc7\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xc4\xc4\xc4\xc7\xc4\xc4\xc4\xc4\xc7\xc4\xc4\xc7\xb1\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc4\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xc2\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xc4'
-'\xc7\xc7\xc7\xc7\xca\xca\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xca\xc4\xc4\xc4\xc4\xc4\xca\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc7\xc4\xc7\xc7\xc7\xc7\xc4\xc4\xca\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xca\xca\xc4\xca\xc4\xc4\xc4\xc4\xca\xc4\xc4\xca\xc4\xc4'
-'\xc7\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc4\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xc7\xca\xc7\xc7\xc7\xc7\xca\xca\xca\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x95j\x95j\x95j\x95j\x95j\x95j\x95jVVVVVVVVVU'
-'XXXXXXXXXWXXXXXXXXXW\xc7\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca'
-'\xb7\xb6\xb6\xb7\xb7\x95j\xb6\xb7\xb7\xb6\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb6\xb6\xb6\xb7\xb7\xb7\xb7\x96k\x96k\x96k\x96k\x95j\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6'
-'\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6'
-'\xb6\xb6\xb6\x95j\x96k\x95j\x95j\x95j\x95j\x95j\x95j\x95j\x95j\x95j\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb6\xb6\xb6\xb6\xb6\xb6\xb6'
-'\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb6\xb7\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb6\xb7\xb7\xb6\xb6\x95j\x95j\xb7\xb6\xb6\xb6\xb6\xb7\xb6\xb7\xb7\xb7\xb6\xb6\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb6\x95j\xb6\xb6'
-'\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb7\xb7\xb7\xb7\xb6\xb6\xb7\xb6\xb7\xb6\xb6\xb7\xb6\xb7\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb6'
-'\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb6\xb7\xb7\xb6\xb6\xb7\xb7\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb7'
-'\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7'
-'\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb7\xb6\xb7\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb6\xb7\xb7\xb7\xb6\xb6\xb6\xb6\xb7\xb6\xb6\xb6\xb7\xb7\xb7\xb7\xb7\xb6\xb7\xb6\xb6'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6\xb6'
-'\xb6\xb6\xb6\xb6\xb6\xc7\xc7\xb6\xb6\xb6\xb6\xb6\xb6\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xca\xc4\xc4\xc4\xc4\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc8\x15'
-'55555555555555555555555555555555555555555555555\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x155\x1b555\x1b\x1b5\x1b5\x1b5\x1b5555\x1b5\x1b\x1b5\x1b\x1b\x1b\x1b\x1b\x1b##55'
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b'
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x1b\xc7\xc7\xc7\xc7\xc7\xc75\x1b5\x1b===5\x1b\x15\x15\x15\x15\x15\x8a\x8a\x8a\x8aW\x8a\x8a'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x1b\x15\x15\x15\x15\x15\x1b\x15\x15................'
-'........................................\x15\x15\x15\x15\x15\x15\x15#\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15='
-'.......................\x15\x15\x15\x15\x15\x15\x15\x15\x15.......\x15.......\x15.......\x15.......\x15'
-'.......\x15.......\x15.......\x15.......\x15================================'
-'\x8a\x8atptp\x8a\x8a\x8atp\x8atp\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8ad\x8a\x8ad\x8atp\x8a\x8atp\x95j\x95j\x95j\x95j\x8a\x8a\x8a\x8a\x8a&\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8add\x8a\x8a\x8a\x8a'
-'d\x8a\x94\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'@@@@:00000000000000000000000000000000000000000000000@:@@@@@:@:::'
+'::@::0000000\x15\x15\x15\x15GGGGGGGGGG\x89\x89\x89\x89\x89\x89\x89\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca@@@@@@@@@\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15'
+'@@:000000000000000000000000000000:@@@@::@@:@@@00GGGGGGGGGG000000'
+'00000000000000000000000000000000000000@:@@:::@:@@@::\x15\x15\x15\x15\x15\x15\x15\x15\x89\x89\x89\x89'
+'000000000000000000000000000000000000::::::::@@@@@@@@::@@\x15\x15\x15\x89\x89\x89\x89\x89'
+'GGGGGGGGGG\x15\x15\x15000GGGGGGGGGG000000000000000000000000000000$$$$$$\x89\x89'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x15\x15\x157777777777777777777777777777777777777777777\x15\x15777'
+'\x89\x89\x89\x89\x89\x89\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15@@@\x89@@@@@@@@@@@@@:@@@@@@@0000 at 0000::@00:@@\x15\x15\x15\x15\x15\x15'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b%%%%%%%%%%%%%%%%%%%%'
+'%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b%\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%'
+'@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\x15@@@@@'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15777777\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15777777\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x157\x157\x157\x157\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b44444444\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b44444444\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b44444444\x1b\x1b\x1b\x1b\x1b\x15\x1b\x1b77774\xab\x1b\xab'
+'\xab\xab\x1b\x1b\x1b\x15\x1b\x1b77774\xab\xab\xab\x1b\x1b\x1b\x1b\x15\x15\x1b\x1b7777\x15\xab\xab\xab\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777\xab\xab\xab\x15\x15\x1b\x1b\x1b\x15\x1b\x1b77774\xab\xab\x15'
+'\xd8\xd8\xd8\xd8\xd8\xd8\xd8\xd8\xd8\xd8\xd8\x08\x08\x08\n\x11ijjiii\x8a\x90xu\x9aywt\x9ay\x8a\x8a\x8a\x90\x8b\x8a\x8a\x8b\xd4\xd5\x0b\x12\x0f\r\x14\xd6\x84\x86\x84\x84\x86\x8a\x90\x90\x90zv\x8a\x90\x90\x8ac'
+'c\x90\x90\x90\xaf\x9bp\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\xbc\x90c\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\xd8\x08\x08\x08\x08\x08\x15\x0c\x13\t\x10\x08\x08\x08\x08\x08\x08V%\x15\x15TVVVVV\xb1\xb1\xbc\x9bp '
+'VTTTTVVVVV\xb1\xb1\xbc\x9bp\x15%%%%%%%%%%%%%\x15\x15\x15\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa2\xa3\xa3\xa0\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3\xa3'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15@@@@@@@@@@@@@<<<<@<<<@@@@@@@@@@@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf7\xcc\xcf\xcc\xcf7\xcf\xcc\x1b777\x1b\x1b777\x19\xcf7\xcc\xcf\xbe77777\xcf\xcf\xcf\xcc\xcc\xcf7\xcf5\xcf7\xcf7577\xc6\x1b7777\x1b0000\x1b\xcf\xcf\x1b\x1b77'
+'\xbd\xbc\xbc\xbc\xbc7\x1b\x1b\x1b\x1b\xcf\xbc\xcf\xcf\x1b\xca]]][[]]]]]][[[[]IIIIIIIIIIIILLLLJJJJJJJJJJMMMMMM'
+'KKK7\x1bKKKK[\xcf\xcf\x15\x15\x15\x15\xb7\xb7\xb7\xb7\xb7\xcc\xcc\xcc\xcc\xcc\xbc\xbc\xcf\xcf\xcf\xcf\xbc\xcf\xcf\xbc\xcf\xcf\xbc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xbc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xbc\xbc\xcf\xcf\xb7\xcf\xb7\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc'
+'\xb7\xbd\xb8\xb8\xbd\xbc\xbc\xb7\xb8\xbd\xbd\xb8\xbd\xbd\xbc\xb7\xbc\xb8\xb1\xb5\xbc\xb8\xbd\xbc\xbc\xbc\xb8\xbd\xbd\xb8\xb7\xb8\xb8\xbd\xbd\xb7\xbd\xb7\xbd\xb7\xb7\xb7\xb7\xb8\xb8\xbd\xb8\xbd\xbd\xbd\xbd\xbd\xb7\xb7\xb7\xb7\xbc\xbd\xbc\xbd\xb8\xb8\xbd\xbd'
+'\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xb8\xbd\xbd\xbd\xb8\xbc\xbc\xbc\xbc\xbc\xb8\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xb8\xb7\xbd\xbc\xb8\xb8\xb8\xb8\xbd\xbd\xb8\xb8\xbc\xbc\xb8\xb8\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd'
+'\xbd\xbd\xb8\xb8\xbd\xbd\xb8\xb8\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbd\xbd\xbd\xbd\xbc\xbc\xb7\xbc\xbc\xbd\xb7\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbc\xb7\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbd\xb8'
+'\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbd\xbd\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x9bp\x9bp\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xcf\xcf\xcf\xcf\xbd\xbd\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x9es\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xcf\xbc\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xca\xcf\xcf\xcf\xcf\xcf\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xbc\xbc\xbc\xbc\xbc\xbc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xd2\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\\\\\\\\\\\\\\\\\\[[[[[[[[[[[\\\\\\\\\\\\\\\\\\[[['
+'[[[[[[[[TTTTTTTTTSSSSSSSSSSS\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8'
+'\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9\xc9^[[[[[[[[[[\\\\\\\\\\\\\\\\\\[\\'
+'\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc'
+'\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcf\xcf\xcf\xcf\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcf\xcf\xcc\xcc\xcc\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xcf\xcc\xb7\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xcf'
+'\xcc\xb7\xcf\xcf\xcf\xcf\xcc\xcc\xcc\xcf\xcf\xcc\xcf\xcf\xcc\xcc\xcc\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcc\xcc\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xbc\xbc\xbc\xbc\xbc\xc1\xc1\xbc'
+'\xcf\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xcf\xcc\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xcf\xcf\xcf\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcf\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcc\xcf\xcc\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xcc\xcc\xcc\xcf\xcc\xcc\xcc\xcc\xcf\xcc\xcc\xcf\xb7\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcc\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xca\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xcc'
+'\xcf\xcf\xcf\xcf\xd2\xd2\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xd2\xcc\xcc\xcc\xcc\xcc\xd2\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcf\xcc\xcf\xcf\xcf\xcf\xcc\xcc\xd2\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xd2\xd2\xcc\xd2\xcc\xcc\xcc\xcc\xd2\xcc\xcc\xd2\xcc\xcc'
+'\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcc\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xd2\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x9bp\x9bp\x9bp\x9bp\x9bp\x9bp\x9bp\\\\\\\\\\\\\\\\\\['
+'^^^^^^^^^]^^^^^^^^^]\xcf\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2'
+'\xbd\xbc\xbc\xbd\xbd\x9bp\xbc\xbd\xbd\xbc\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbc\xbc\xbc\xbd\xbd\xbd\xbd\x9cq\x9cq\x9cq\x9cq\x9bp\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc'
 '\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
 '\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
 '\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15'
-'\xcf\x8e\x8e\x8e\xca$/H\x98m\x98m\x98m\x98m\x98m\xca\xca\x98m\x98m\x98m\x98me\x97ll\xcaHHHHHHHHH????99e$$$$$\xca\xcaHHH$/\x8e\xca\xc7'
-'\x15///////////////////////////////////////////////////////////////'
-'///////////////////////\x15\x15??\xa7\xa7$$/e///////////////////////////////'
-'///////////////////////////////////////////////////////////\x8e$$$/'
-'\x15\x15\x15\x15\x15///////////////////////////////////////////\x15///////////////'
-'////////////////////////////////////////////////////////////////'
-'///////////////\x15\xc3\xc3TTTT\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3///////////////////////////\x15\x15\x15\x15\x15'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15////////////////'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xca\xca\x15TTTTTTTTTT\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3QQQQQQQQ\xcaYYYYYYYYYYYYYYY\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xca\xca\xca\xc3'
-'TTTTTTTTTT\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3YYYYYYYYYYYYYYY'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xca\xca\xca\xca\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\x15'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xca\xca\xca\xca\xc3\xc3\xc3\xc3\xc3'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xca\xca\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xca'
-'/////0//////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'///0////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////0/////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/////////////0//////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'0//0///0/0//////////////////////////////////////////////////////'
-'/////////////////////////////0//////////////////////////////////'
-'////////////0///////0/0////////////////////////////////////////0'
-'0//////////////////////////////0////////0///////////////////////'
-'/////////////0//////////////////////////////////////////////////'
-'////////////////////////////////////////////////0///////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////0///////////////////////////////////////////////////////////'
-'//////0//////////////////////////////////0/0/0//////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/0/000//////0///////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/0000///////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'///////////////////////////0////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/////////////////////////////////////////////////0///////0//////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////////////////0/////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////////////////////00'
-'////////////000/0///////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////////////////////0/'
-'////////////////////////////////////////////////////////////////'
-'////////////0///////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////0/////////////////////////////////////////////'
-'//////0/////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////0/////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////////////////////0/'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////0/////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////0///////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////0////0////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////0///////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/////////////////////////////////0//////////////////////////////'
-'//////0/////0///////////////////////////////////////////0///////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////////////0/////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
-'/////////////////////$//////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/////////////\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15........................................######\x83\x83'
-'............#\x8a\x8a\x8a................DDDDDDDDDD..\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-"5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b.=:::\x8a==========\x8a'"
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b##==................................'
-'......................................GGGGGGGGGG==\x83\x83\x83\x83\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15'
-"\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5\xa5'''''''''\xa5\xa55\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b\x1b\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b"
-'5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b#\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b5\x1b5\x1b55\x1b'
-"5\x1b5\x1b5\x1b5\x1b'\xa2\xa25\x1b5\x1b.5\x1b5\x1b\x1b\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b5\x1b55555\x1b55555\x1b5\x1b5\x1b\x15\x15\x15\x15\x15\x15"
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15.##\x1b.....'
-'..=...=....=.......................88==8\xc7\xc7\xc7\xc7\x15\x15\x15\x15RRRRRR\xc2\xc2\x9d\xbf\x15\x15\x15\x15\x15\x15'
-'....................................................\x8a\x8a\x8a\x8a\x15\x15\x15\x15\x15\x15\x15\x15'
-'88..................................................888888888888'
-'8888==\x15\x15\x15\x15\x15\x15\x15\x15\x83\x83DDDDDDDDDD\x15\x15\x15\x15\x15\x15==================......\x83\x83\x83.\x83..='
-'DDDDDDDDDD............................========\x83\x83................'
-'.......===========88\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x83/////////////////////////////\x15\x15\x15'
-'===8...............................................=88====88=888'
-'8\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x15#DDDDDDDDDD\x15\x15\x15\x15\x83\x83.....=#.........DDDDDDDDDD.....\x15'
-'.........................................======88==88==\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'...=........=8\x15\x15DDDDDDDDDD\x15\x15\x83\x83\x83\x83................#......\xc2\xc2\xc2.8=8..'
-'................................................=.===..==.....=='
-'.=.\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15..#\x83\x83...........8==88\x83\x83.##8=\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15......\x15\x15......\x15\x15......\x15\x15\x15\x15\x15\x15\x15\x15\x15.......\x15.......\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xa2####\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc'
+'\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc'
+'\xbc\xbc\xbc\x9bp\x9cq\x9bp\x9bp\x9bp\x9bp\x9bp\x9bp\x9bp\x9bp\x9bp\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbc\xbc\xbc\xbc\xbc\xbc\xbc'
+'\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbc\xbd\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbc\xbd\xbd\xbc\xbc\x9bp\x9bp\xbd\xbc\xbc\xbc\xbc\xbd\xbc\xbd\xbd\xbd\xbc\xbc\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbc\x9bp\xbc\xbc'
+'\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbd\xbd\xbd\xbd\xbc\xbc\xbd\xbc\xbd\xbc\xbc\xbd\xbc\xbd\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbc'
+'\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbc\xbd\xbd\xbc\xbc\xbd\xbd\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbd'
+'\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd'
+'\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbd\xbc\xbd\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbc\xbd\xbd\xbd\xbc\xbc\xbc\xbc\xbd\xbc\xbc\xbc\xbd\xbd\xbd\xbd\xbd\xbc\xbd\xbc\xbc'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc\xbc'
+'\xbc\xbc\xbc\xbc\xbc\xcf\xcf\xbc\xbc\xbc\xbc\xbc\xbc\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xd2\xcc\xcc\xcc\xcc\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd0\x15'
+'77777777777777777777777777777777777777777777777\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x157\x1b777\x1b\x1b7\x1b7\x1b7\x1b7777\x1b7\x1b\x1b7\x1b\x1b\x1b\x1b\x1b\x1b%%77'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x1b\xcf\xcf\xcf\xcf\xcf\xcf7\x1b7\x1b@@@7\x1b\x15\x15\x15\x15\x15\x90\x90\x90\x90]\x90\x90'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x1b\x15\x15\x15\x15\x15\x1b\x15\x150000000000000000'
+'0000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15$\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15@'
+'00000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x150000000\x150000000\x150000000\x150000000\x15'
+'0000000\x150000000\x150000000\x150000000\x15@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'
+'\x90\x90zvzv\x90\x90\x90zv\x90zv\x90\x90\x90\x90\x90\x90\x90\x90\x90j\x90\x90j\x90zv\x90\x90zv\x9bp\x9bp\x9bp\x9bp\x90\x90\x90\x90\x90(\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90jj\x90\x90\x90\x90'
+'j\x90\x9a\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15'
+'\xd7\x94\x94\x94\xd2&1N\x9es\x9es\x9es\x9es\x9es\xd2\xd2\x9es\x9es\x9es\x9esk\x9drr\xd2NNNNNNNNNBBBB;;k&&&&&\xd2\xd2NNN&1\x94\xd2\xcf'
+'\x15111111111111111111111111111111111111111111111111111111111111111'
+'11111111111111111111111\x15\x15BB\xad\xad&&1k1111111111111111111111111111111'
+'11111111111111111111111111111111111111111111111111111111111\x94&&&1'
+'\x15\x15\x15\x15\x151111111111111111111111111111111111111111111\x15111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111\x15\xcb\xcbZZZZ\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb111111111111111111111111111\x15\x15\x15\x15\x15'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x151111111111111111'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xd2\xd2\x15ZZZZZZZZZZ\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcbWWWWWWWW\xd2_______________\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xd2\xd2\xd2\xcb'
+'ZZZZZZZZZZ\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb_______________'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xd2\xd2\xd2\xd2\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\x15'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xd2\xd2\xd2\xd2\xcb\xcb\xcb\xcb\xcb'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xd2\xd2\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xd2'
+'1111121111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1112111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111112111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111211111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111111111111111111111111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'2112111212111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111121111111111111111111111111111111111'
+'1111111111112111111121211111111111111111111111111111111111111112'
+'2111111111111111111111111111111211111111211111111111111111111111'
+'1111111111111211111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111112111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111211111111111111111111111111111111111111111111111111111111111'
+'1111112111111111111111111111111111111111121212111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1212221111112111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1222211111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111112111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111211111112111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111211111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111122'
+'1111111111112221211111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111121'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111112111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111112111111111111111111111111111111111111111111111'
+'1111112111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111211111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111121'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111112111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111121111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111211112111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111112111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111112111111111111111111111111111111'
+'1111112111112111111111111111111111111111111111111111111121111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111112111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111111111111111111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
+'111111111111111111111&111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111\x15\x15\x15\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15\x15\x15\x150000000000000000000000000000000000000000$$$$$$\x89\x89'
+'000000000000$\x90\x90\x900000000000000000GGGGGGGGGG00\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b0@<<<\x90@@@@@@@@@@\x90)'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b%%@@00000000000000000000000000000000'
+'00000000000000000000000000000000000000KKKKKKKKKK@@\x89\x89\x89\x89\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab\xab)))))))))\xab\xab7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b\x1b\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b'
+'7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b%\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b7\x1b7\x1b77\x1b'
+'7\x1b7\x1b7\x1b7\x1b)\xa8\xa87\x1b7\x1b07\x1b7\x1b\x1b\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b7\x1b77777\x1b77777\x1b7\x1b7\x1b\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x150%%\x1b00000'
+'00 at 000@0000 at 00000000000000000000000::@@:\xcf\xcf\xcf\xcf\x15\x15\x15\x15XXXXXX\xca\xca\xa3\xc5\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000\x90\x90\x90\x90\x15\x15\x15\x15\x15\x15\x15\x15'
+'::00000000000000000000000000000000000000000000000000::::::::::::'
+'::::@@\x15\x15\x15\x15\x15\x15\x15\x15\x89\x89GGGGGGGGGG\x15\x15\x15\x15\x15\x15@@@@@@@@@@@@@@@@@@000000\x89\x89\x890\x8900@'
+'GGGGGGGGGG0000000000000000000000000000@@@@@@@@\x89\x890000000000000000'
+'0000000@@@@@@@@@@@::\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x8911111111111111111111111111111\x15\x15\x15'
+'@@@:00000000000000000000000000000000000000000000000@::@@@@::@:::'
+':\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x15$GGGGGGGGGG\x15\x15\x15\x15\x89\x8900000@$000000000GGGGGGGGGG00000\x15'
+'00000000000000000000000000000000000000000@@@@@@::@@::@@\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000 at 00000000@:\x15\x15GGGGGGGGGG\x15\x15\x89\x89\x89\x890000000000000000$000000\xca\xca\xca0:@:00'
+'000000000000000000000000000000000000000000000000 at 0@@@00@@00000@@'
+'0 at 0\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1500$\x89\x8900000000000:@@::\x89\x890$$:@\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15000000\x15\x15000000\x15\x15000000\x15\x15\x15\x15\x15\x15\x15\x15\x150000000\x150000000\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xa8%%%%\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
 '\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'...................................88=88=88\x838=\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15................'
-'.......\x15\x15\x15\x15.................................................\x15\x15\x15\x15'
+'00000000000000000000000000000000000::@::@::\x89:@\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111111111111111111111111\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x150000000000000000'
+'0000000\x15\x15\x15\x150000000000000000000000000000000000000000000000000\x15\x15\x15\x15'
 '\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18'
 '\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18'
 '\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18\x18'
@@ -61857,367 +61865,367 @@
 '\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17'
 '\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17'
 '\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17'
-'////////////////////////////////////////////////////////////////'
-'///////////////////////////////////////////0///////0////0///////'
-'//////////////////////////////////////////////////0/////////////'
-'/////////////////0/0/////////////////////////////////////////0//'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////\x16\x16////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x151=1111111111\xab1111111111111\x1511111\x151\x15'
-'11\x1511\x151111111111************************************************'
-'**************************************************\xa1\xa1\xa1\xa1\xa1\xa1\xa1\xa1\xa1\xa1\xa1\xa1\xa1\xa1'
-'\xa1\xa1\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15*********************************************'
-'****************************************************************'
-'******************************))))))****************************'
-'****************************************************************'
-'****************************************************************'
-'**************************************************************i\x94'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15************************************************'
-'****************\x15\x15**********************************************'
-'********\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15**********))\x99\xc7\x15\x15'
-'<<<<<<<<<<<<<<<<\x8e\x8e\x8e\x8f\x8e\x8e\x8e\x97l\x8e\x15\x15\x15\x15\x15\x15================\x8eee__\x97l\x97l\x97l\x97l\x97l\x97'
-'l\x97l\x97l\x8e\x8e\x97l\x8e\x8e\x8e\x8e___|\x8e}\x15\x8e}\x8e\x8ee\x98m\x98m\x98m\x82\x8e\x8e\xadb\xbc\xbc\xbb\x15\x8e\x9f\x82\x8e\x15\x15\x15\x15)*)*)\x15)*)*)*)*)*'
-'****************************************************************'
-'*************************************************************\x15\x15\x08'
-'\x15\x87\x87\x7f\x9b\x7f\x87\x88\x92g\x87\xaaw`xwAAAAAAAAAAx\x87\xb4\xb3\xb4\x87\x8744444444444444444444444444\x92\x87g\xa4\\'
-'\xa4\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x92\xb3g\xb3\x92g\x89\x93h\x89\x89,,,,,,,,,,!,,,,,,,,,,,,,,,'
-',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,  ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\x15'
-'\x15\x15,,,,,,\x15\x15,,,,,,\x15\x15,,,,,,\x15\x15,,,\x15\x15\x15\x9b\x9b\xb3\xa4\xc5\x9b\x9b\x15\xc6\xb5\xb5\xb5\xb5\xc6\xc6\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x0e\x0e\x0e\xc7\xc4\x15\x15'
-'............\x15..........................\x15...................\x15..\x15.'
-'..............\x15\x15..............\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'................................................................'
-'...........................................................\x15\x15\x15\x15\x15'
-'\x83\x8a\x83\x15\x15\x15\x15RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR\x15\x15\x15\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIWWWW\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7WW\xc7\xc2\xc2\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2=\x15\x15'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111211111112111121111111'
+'1111111111111111111111111111111111111111111111111121111111111111'
+'1111111111111111121211111111111111111111111111111111111111111211'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111\x16\x161111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'11111111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15\x153 at 3333333333\xb13333333333333\x1533333\x153\x15'
+'33\x1533\x153333333333,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\xa7\xa7\xa7\xa7\xa7\xa7\xa7\xa7\xa7\xa7\xa7\xa7\xa7\xa7'
+'\xa7\xa7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,++++++,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,o\x9a'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,\x15\x15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15,,,,,,,,,,++\x9f\xcf\x15\x15'
+'>>>>>>>>>>>>>>>>\x94\x94\x94\x95\x94\x94\x94\x9dr\x94\x15\x15\x15\x15\x15\x15@@@@@@@@@@@@@@@@\x94kkee\x9dr\x9dr\x9dr\x9dr\x9dr\x9d'
+'r\x9dr\x9dr\x94\x94\x9dr\x94\x94\x94\x94eee\x82\x94\x83\x15\x94\x83\x94\x94k\x9es\x9es\x9es\x88\x94\x94\xb3h\xc2\xc2\xc1\x15\x94\xa5\x88\x94\x15\x15\x15\x15+,+,+\x15+,+,+,+,+,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\x15\x15\x08'
+'\x15\x8d\x8d\x85\xa1\x85\x8d\x8e\x98m\x8d\xb0}f~}DDDDDDDDDD~\x8d\xba\xb9\xba\x8d\x8d66666666666666666666666666\x98\x8dm\xaab'
+'\xaa\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x1a\x98\xb9m\xb9\x98m\x8f\x99n\x8f\x8f.........."...............'
+'..............................!!...............................\x15'
+'\x15\x15......\x15\x15......\x15\x15......\x15\x15...\x15\x15\x15\xa1\xa1\xb9\xaa\xcd\xa1\xa1\x15\xce\xbb\xbb\xbb\xbb\xce\xce\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x0e\x0e\x0e\xcf\xcc\x15\x15'
+'000000000000\x1500000000000000000000000000\x150000000000000000000\x1500\x150'
+'00000000000000\x15\x1500000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'00000000000000000000000000000000000000000000000000000000000\x15\x15\x15\x15\x15'
+'\x89\x90\x89\x15\x15\x15\x15XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO]]]]\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf]]\xcf\xca\xca\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca@\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.............................\x15\x15\x15................................'
-'.................\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15=OOOOOOOOOOOOOOOOOOOOOOOOOOO\x15\x15\x15\x15'
-'................................RRRR\x15\x15\x15\x15\x15\x15\x15\x15\x15...................'
-'.G........G\x15\x15\x15\x15\x15......................................=====\x15\x15\x15\x15\x15'
-'..............................\x15\x83................................'
-'....\x15\x15\x15\x15........\x83GGGGG\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'5555555555555555555555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b................................................'
-'..............................\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x155555555555555555'
-'55555555555555555555\x15\x15\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15'
-'........................................\x15\x15\x15\x15\x15\x15\x15\x15................'
-'....................................\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'00000000000000000000000000000\x15\x15\x1500000000000000000000000000000000'
+'00000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15 at UUUUUUUUUUUUUUUUUUUUUUUUUUU\x15\x15\x15\x15'
+'00000000000000000000000000000000XXXX\x15\x15\x15\x15\x15\x15\x15\x15\x150000000000000000000'
+'0K00000000K\x15\x15\x15\x15\x1500000000000000000000000000000000000000@@@@@\x15\x15\x15\x15\x15'
+'000000000000000000000000000000\x15\x8900000000000000000000000000000000'
+'0000\x15\x15\x15\x1500000000\x89KKKKK\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'7777777777777777777777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b000000000000000000000000000000000000000000000000'
+'000000000000000000000000000000\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x157777777777777777'
+'77777777777777777777\x15\x15\x15\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x150000000000000000'
+'000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.......................................................\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'......................\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15........\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1500000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'111111\x15\x151\x1511111111111111111111111111111111111111111111\x1511\x15\x15\x151\x15\x151'
-'1111111111111111111111\x15\x90ZZZZZZZZ11111111111111111111111\xcb\xcbZZZZZZZ'
-'1111111111111111111111111111111\x15\x15\x15\x15\x15\x15\x15\x15ZZZZZZZZZ\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x151111111111111111111\x1511\x15\x15\x15\x15\x15ZZZZZ'
-'1111111111111111111111ZZZZZZ\x15\x15\x15\x8a11111111111111111111111111\x15\x15\x15\x15\x15\x90'
+'333333\x15\x153\x1533333333333333333333333333333333333333333333\x1533\x15\x15\x153\x15\x153'
+'3333333333333333333333\x15\x96````````33333333333333333333333\xd3\xd3```````'
+'3333333333333333333333333333333\x15\x15\x15\x15\x15\x15\x15\x15`````````\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x153333333333333333333\x1533\x15\x15\x15\x15\x15`````'
+'3333333333333333333333``````\x15\x15\x15\x9033333333333333333333333333\x15\x15\x15\x15\x15\x96'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'11111111111111111111111111111111111111111111111111111111\x15\x15\x15\x15ZZ11'
-'ZZZZZZZZZZZZZZZZ\x15\x15ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ'
-'1===\x15==\x15\x15\x15\x15\x15====1111\x15111\x1511111111111111111111111111111\x15\x15===\x15\x15\x15\x15='
-'[[[[ZZZZZ\x15\x15\x15\x15\x15\x15\x15\x90\x90\x90\x90\x90\x90\x90\x90\x90\x15\x15\x15\x15\x15\x15\x1511111111111111111111111111111ZZ\x90'
-'11111111111111111111111111111ZZZ\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'11111111\xcb1111111111111111111111111111==\x15\x15\x15\x15ZZZZZ\x90\x90\x90\x90\x90\x90\x90\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'111111111111111111111111111111111111111111111111111111\x15\x15\x15\x8a\x8a\x8a\x8a\x8a\x8a\x8a'
-'1111111111111111111111\x15\x15ZZZZZZZZ1111111111111111111\x15\x15\x15\x15\x15ZZZZZZZZ'
-'111111111111111111\x15\x15\x15\x15\x15\x15\x15\x90\x90\x90\x90\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15ZZZZZZZ\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'33333333333333333333333333333333333333333333333333333333\x15\x15\x15\x15``33'
+'````````````````\x15\x15``````````````````````````````````````````````'
+'3@@@\x15@@\x15\x15\x15\x15\x15@@@@3333\x15333\x1533333333333333333333333333333\x15\x15@@@\x15\x15\x15\x15@'
+'aaaa`````\x15\x15\x15\x15\x15\x15\x15\x96\x96\x96\x96\x96\x96\x96\x96\x96\x15\x15\x15\x15\x15\x15\x1533333333333333333333333333333``\x96'
+'33333333333333333333333333333```\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'33333333\xd33333333333333333333333333333@@\x15\x15\x15\x15`````\x96\x96\x96\x96\x96\x96\x96\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'333333333333333333333333333333333333333333333333333333\x15\x15\x15\x90\x90\x90\x90\x90\x90\x90'
+'3333333333333333333333\x15\x15````````3333333333333333333\x15\x15\x15\x15\x15````````'
+'333333333333333333\x15\x15\x15\x15\x15\x15\x15\x96\x96\x96\x96\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15```````\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'1111111111111111111111111111111111111111111111111111111111111111'
-'111111111\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'777777777777777777777777777777777777777777777777777\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x15\x15\x15\x15\x15\x15\x15ZZZZZZ'
-'************************************====\x15\x15\x15\x15\x15\x15\x15\x15@@@@@@@@@@\x15\x15\x15\x15\x15\x15'
+'3333333333333333333333333333333333333333333333333333333333333333'
+'333333333\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'999999999999999999999999999999999999999999999999999\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x15\x15\x15\x15\x15\x15\x15``````'
+',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,@@@@\x15\x15\x15\x15\x15\x15\x15\x15CCCCCCCCCC\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15LLLLLLLLLKKKKKKKKKKKKKKKKKKKKKK\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15RRRRRRRRRQQQQQQQQQQQQQQQQQQQQQQ\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'11111111111111111111111111111ZZZZZZZZZZ1\x15\x15\x15\x15\x15\x15\x15\x15****************'
-'******===========JJJJuuuuu\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'33333333333333333333333333333``````````3\x15\x15\x15\x15\x15\x15\x15\x15,,,,,,,,,,,,,,,,'
+',,,,,,@@@@@@@@@@@PPPP{{{{{\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'8=8.....................................................========'
-'=======\x83\x83\x83\x83\x83\x83\x83\x15\x15\x15\x15XXXXXXXXXWWWWWWWWWWWDDDDDDDDDD\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15='
-'==8.............................................888====88==\x83\x83\n\x83\x83'
-'\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\n\x15\x15.........................\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15'
-'===....................................=====8========\x15DDDDDDDDDD'
-'\x83\x83\x83\x83.88\x15\x15\x15\x15\x15\x15\x15\x15\x15...................................=\x83\x83.\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'==8................................................888=========8'
-'8....\x83\x83\x83\x83====\x83\x15\x15DDDDDDDDDD.\x83.\x83\x83\x83\x15RRRRRRRRRRRRRRRRRRRR\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'..................\x15.........................888===88=8==\x83\x83\x83\x83\x83\x83=\x15'
+':@:00000000000000000000000000000000000000000000000000000@@@@@@@@'
+'@@@@@@@\x89\x89\x89\x89\x89\x89\x89\x15\x15\x15\x15^^^^^^^^^]]]]]]]]]]]GGGGGGGGGG\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15@'
+'@@:000000000000000000000000000000000000000000000:::@@@@::@@\x89\x89\n\x89\x89'
+'\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\n\x15\x150000000000000000000000000\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15'
+'@@@000000000000000000000000000000000000@@@@@:@@@@@@@@\x15GGGGGGGGGG'
+'\x89\x89\x89\x890::\x15\x15\x15\x15\x15\x15\x15\x15\x1500000000000000000000000000000000000@\x89\x890\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'@@:000000000000000000000000000000000000000000000000:::@@@@@@@@@:'
+':0000\x89\x89\x89\x89@@@@\x89\x15\x15GGGGGGGGGG0\x890\x89\x89\x89\x15XXXXXXXXXXXXXXXXXXXX\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000\x150000000000000000000000000:::@@@::@:@@\x89\x89\x89\x89\x89\x89@\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.......\x15.\x15....\x15...............\x15..........\x83\x15\x15\x15\x15\x15\x15................'
-'...............................=888========\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15'
-'==88\x15........\x15\x15..\x15\x15......................\x15.......\x15..\x15.....\x15==.88'
-'=8888\x15\x1588\x15\x15888\x15\x15.\x15\x15\x15\x15\x15\x158\x15\x15\x15\x15\x15.....88\x15\x15=======\x15\x15\x15=====\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000\x150\x150000\x15000000000000000\x150000000000\x89\x15\x15\x15\x15\x15\x150000000000000000'
+'0000000000000000000000000000000@:::@@@@@@@@\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15'
+'@@::\x1500000000\x15\x1500\x15\x150000000000000000000000\x150000000\x1500\x1500000\x15@@0::'
+'@::::\x15\x15::\x15\x15:::\x15\x150\x15\x15\x15\x15\x15\x15:\x15\x15\x15\x15\x1500000::\x15\x15@@@@@@@\x15\x15\x15@@@@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.....................................................888========'
-'88===8=....\x83\x83\x83\x83\x83DDDDDDDDDD\x15\x83\x15\x83=\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'................................................888======8=8888='
-'=8==..\x83.\x15\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'00000000000000000000000000000000000000000000000000000:::@@@@@@@@'
+'::@@@:@0000\x89\x89\x89\x89\x89GGGGGGGGGG\x15\x89\x15\x89@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000000000000000000000000000000000:::@@@@@@:@::::@'
+'@:@@00\x890\x15\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'...............................................888====\x15\x158888==8='
-'=\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83\x83....==\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'................................................888========88=8='
-'=\x83\x83\x83.\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x8a\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'...........................................=8=88======8=\x15\x15\x15\x15\x15\x15\x15\x15'
-'DDDDDDDDDD\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'...........................\x15\x15===88====8=====\x15\x15\x15\x15DDDDDDDDDDRR\x83\x83\x83\xc2'
+'00000000000000000000000000000000000000000000000:::@@@@\x15\x15::::@@:@'
+'@\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x89\x890000@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000000000000000000000000000000000:::@@@@@@@@::@:@'
+'@\x89\x89\x890\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000@:@::@@@@@@:@\x15\x15\x15\x15\x15\x15\x15\x15'
+'GGGGGGGGGG\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000000000000\x15\x15@@@::@@@@:@@@@@\x15\x15\x15\x15GGGGGGGGGGXX\x89\x89\x89\xca'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'............................................888=========8==\x83\x15\x15\x15\x15'
+'00000000000000000000000000000000000000000000:::@@@@@@@@@:@@\x89\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1555555555555555555555555555555555'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1bDDDDDDDDDDRRRRRRRRR\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15.'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x1577777777777777777777777777777777'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1bGGGGGGGGGGXXXXXXXXX\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x150'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.======;;==........................................======8.====\x83'
-'\x83\x83\x83\x83\x83\x83\x83=\x15\x15\x15\x15\x15\x15\x15\x15.======88===....................................'
-'....\x15\x15....=============8==\x83\x83\x83.\x83\x83\x83\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.........................................................\x15\x15\x15\x15\x15\x15\x15'
-'.........\x15.....................................8=======\x15======8;'
-'.\x83\x83\x83\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDDRRRRRRRRRRRRRRRRRRR\x15\x15\x15\x83\x83..............'
-'................\x15\x15======================\x158=======8==8==\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0@@@@@@==@@0000000000000000000000000000000000000000@@@@@@:0@@@@\x89'
+'\x89\x89\x89\x89\x89\x89\x89@\x15\x15\x15\x15\x15\x15\x15\x150@@@@@@::@@@000000000000000000000000000000000000'
+'0000\x15\x150000@@@@@@@@@@@@@:@@\x89\x89\x890\x89\x89\x89\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15'
+'000000000\x150000000000000000000000000000000000000:@@@@@@@\x15@@@@@@:='
+'0\x89\x89\x89\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGGXXXXXXXXXXXXXXXXXXX\x15\x15\x15\x89\x8900000000000000'
+'0000000000000000\x15\x15@@@@@@@@@@@@@@@@@@@@@@\x15:@@@@@@@:@@:@@\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.......\x15..\x15......................................======\x15\x15\x15=\x15==\x15='
-'======.=\x15\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15......\x15..\x15......................'
-'..........88888\x15==\x1588=8=.\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000\x1500\x1500000000000000000000000000000000000000@@@@@@\x15\x15\x15@\x15@@\x15@'
+'@@@@@@0@\x15\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15000000\x1500\x150000000000000000000000'
+'0000000000:::::\x15@@\x15::@:@0\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15...................==88\x83\x83\x15\x15\x15\x15\x15\x15\x15'
-'................................................................'
-'................................................................'
-'..........................\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x150000000000000000000@@::\x89\x89\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'00000000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG'
-'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG\x15\x83\x83\x83\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'................................................................'
-'................................................................'
-'................................................................'
-'....\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK'
+'KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK\x15\x89\x89\x89\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'...............................................\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'00000000000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'................................................................'
-'.......\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'.........................................................\x15\x15\x15\x15\x15\x15\x15'
-'...............................\x15DDDDDDDDDD\x15\x15\x15\x15\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000000000000000000000000000000000000000000\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000\x15GGGGGGGGGG\x15\x15\x15\x15\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15..............................\x15\x15=====\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'................................................=======\x83\x83\x83\x83\x83\xc2\xc2\xc2\xc2'
-'####\x83\xc2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15DDDDDDDDDD\x15RRRRRRR\x15.....................\x15\x15\x15\x15\x15...'
-'................\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15000000000000000000000000000000\x15\x15@@@@@\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'000000000000000000000000000000000000000000000000@@@@@@@\x89\x89\x89\x89\x89\xca\xca\xca\xca'
+'$$$$\x89\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15GGGGGGGGGG\x15XXXXXXX\x15000000000000000000000\x15\x15\x15\x15\x15000'
+'0000000000000000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'55555555555555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'RRRRRRRRRRRRRRRRRRRRRRR\x83\x83\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'77777777777777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'XXXXXXXXXXXXXXXXXXXXXXX\x89\x89\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'................................................................'
-'.....\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15.8888888888888888888888888888888888888888888888\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15====#############\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15$$\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////////////\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'///////////////////////////////////////////////////\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'///////////////////////////////\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////\x15\x15\x15\x15'
-'................................................................'
-'...........................................\x15\x15\x15\x15\x15.............\x15\x15\x15'
-'.........\x15\x15\x15\x15\x15\x15\x15..........\x15\x15\xc2==\x83\x08\x08\x08\x08\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'00000\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x150::::::::::::::::::::::::::::::::::::::::::::::\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15@@@@$$$$$$$$$$$$$\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15&&\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'11111111111111111111111111111111111111111111111111\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111111111111111111111111111111111111111\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'1111111111111111111111111111111\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x151111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111111111111111111111111111111111111111111111111\x15\x15\x15\x15'
+'0000000000000000000000000000000000000000000000000000000000000000'
+'0000000000000000000000000000000000000000000\x15\x15\x15\x15\x150000000000000\x15\x15\x15'
+'000000000\x15\x15\x15\x15\x15\x15\x150000000000\x15\x15\xca@@\x89\x08\x08\x08\x08\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\x15\x15\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc288===\xc2\xc2\xc2888888\x08\x08\x08\x08\x08\x08\x08\x08====='
-'===\xc2\xc2=======\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2====\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7===\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca::@@@\xca\xca\xca::::::\x08\x08\x08\x08\x08\x08\x08\x08@@@@@'
+'@@@\xca\xca@@@@@@@\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca@@@@\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf@@@\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15RRRRRRRRRRRRRRRRRRRR\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15RRRRRRRRRRRRRRRRRRRRRRRRR\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15XXXXXXXXXXXXXXXXXXXX\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15XXXXXXXXXXXXXXXXXXXXXXXXX\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'55555555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b555555555555'
-'55555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b555555555555555555555555'
-'55\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b5\x1555\x15\x155\x15\x1555\x15\x155555\x1555555555\x1b\x1b\x1b\x1b\x15\x1b\x15\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b55\x155555\x15\x1555555555\x155555555\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55\x155555\x15'
-'55555\x155\x15\x15\x155555555\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555555555555555'
-'555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b55555555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b5555'
-'5555555555555555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b5555555555555555'
-'5555555555\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15555555555555555555555555'
-'5\xb0\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xb7\x1b\x1b\x1b\x1b\x1b\x1b5555555555555555555555555\xb0\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xb7\x1b\x1b\x1b\x1b\x1b\x1b5555555555555555555555555\xb0\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xb7\x1b\x1b\x1b\x1b\x1b\x1b5555555555555555555555555\xb0\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xb7\x1b\x1b\x1b\x1b\x1b\x1b5555555555555555555555555\xb0\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
-'\x1b\x1b\x1b\xb7\x1b\x1b\x1b\x1b\x1b\x1b5\x1b\x15\x15BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB'
-'=======================================================\xc2\xc2\xc2\xc2====='
-'=============================================\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2=\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc2\xc2\xc2\xc2=\xc2\xc2\x83\x83\x83\x83\x83\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15=====\x15===============\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'77777777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b777777777777'
+'77777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b777777777777777777777777'
+'77\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b7\x1577\x15\x157\x15\x1577\x15\x157777\x1577777777\x1b\x1b\x1b\x1b\x15\x1b\x15\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b77\x157777\x15\x1577777777\x157777777\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77\x157777\x15'
+'77777\x157\x15\x15\x157777777\x15\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777777777777777'
+'777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b77777777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b7777'
+'7777777777777777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b7777777777777777'
+'7777777777\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x15\x15777777777777777777777777'
+'7\xb6\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xbd\x1b\x1b\x1b\x1b\x1b\x1b7777777777777777777777777\xb6\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xbd\x1b\x1b\x1b\x1b\x1b\x1b7777777777777777777777777\xb6\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xbd\x1b\x1b\x1b\x1b\x1b\x1b7777777777777777777777777\xb6\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\xbd\x1b\x1b\x1b\x1b\x1b\x1b7777777777777777777777777\xb6\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b\x1b'
+'\x1b\x1b\x1b\xbd\x1b\x1b\x1b\x1b\x1b\x1b7\x1b\x15\x15EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE'
+'@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\xca\xca\xca\xca@@@@@'
+'@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\xca\xca\xca\xca\xca\xca\xca\xca@\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xca\xca\xca\xca@\xca\xca\x89\x89\x89\x89\x89\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15@@@@@\x15@@@@@@@@@@@@@@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'=======\x15=================\x15\x15=======\x15==\x15=====\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'@@@@@@@\x15@@@@@@@@@@@@@@@@@\x15\x15@@@@@@@\x15@@\x15@@@@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'1111111111111111111111111111111111111111111111111111111111111111'
-'1111111111111111111111111111111111111111111111111111111111111111'
-'1111111111111111111111111111111111111111111111111111111111111111'
-'11111\x15\x15ZZZZZZZZZ=======\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'7777777777777777777777777777777777\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d'
-'\x1d\x1d\x1d\x1d=======\x15\x15\x15\x15\x15EEEEEEEEEE\x15\x15\x15\x15\x90\x90\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'3333333333333333333333333333333333333333333333333333333333333333'
+'3333333333333333333333333333333333333333333333333333333333333333'
+'3333333333333333333333333333333333333333333333333333333333333333'
+'33333\x15\x15`````````@@@@@@@\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'9999999999999999999999999999999999\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d\x1d'
+'\x1d\x1d\x1d\x1d@@@@@@@\x15\x15\x15\x15\x15HHHHHHHHHH\x15\x15\x15\x15\x96\x96\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15JJJJJJJJJJJJJJJ'
-'JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ\xbdJJJ\x99JJJJ\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15PPPPPPPPPPPPPPP'
+'PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP\xc3PPP\x9fPPPP\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'****\x15***************************\x15**\x15*\x15\x15*\x15**********\x15****\x15*\x15*\x15\x15\x15\x15'
-'\x15\x15*\x15\x15\x15\x15*\x15*\x15*\x15***\x15**\x15*\x15\x15*\x15*\x15*\x15*\x15*\x15**\x15*\x15\x15****\x15*******\x15****\x15****\x15*\x15'
-'**********\x15*****************\x15\x15\x15\x15\x15***\x15*****\x15*****************\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xb6\xb6\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'NNNNNNNNNNNWW\x15\x15\x15\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc2\xc7\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1'
-'\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc7\xc7\x15\x15\x15\x15\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1'
-'\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc3\xc1\xc1\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\xc1\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2\xc2'
-'\xc3\xc3\xc3\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\x15\x15\x15\x15'
-'\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\xc3\x15\x15\x15\x15\x15\x15\x15\xc3\xc3\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+',,,,\x15,,,,,,,,,,,,,,,,,,,,,,,,,,,\x15,,\x15,\x15\x15,\x15,,,,,,,,,,\x15,,,,\x15,\x15,\x15\x15\x15\x15'
+'\x15\x15,\x15\x15\x15\x15,\x15,\x15,\x15,,,\x15,,\x15,\x15\x15,\x15,\x15,\x15,\x15,\x15,,\x15,\x15\x15,,,,\x15,,,,,,,\x15,,,,\x15,,,,\x15,\x15'
+',,,,,,,,,,\x15,,,,,,,,,,,,,,,,,\x15\x15\x15\x15\x15,,,\x15,,,,,\x15,,,,,,,,,,,,,,,,,\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xbc\xbc\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'TTTTTTTTTTT]]\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xcf\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8'
+'\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc7\xc7\xc7\xc7\xc7\xc7\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xcf\xcf\x15\x15\x15\x15\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8'
+'\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc8\xc7\xc7\xc7\xc7\xcb\xc7\xc7\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xcb\xcb\xcb\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\x15\x15\x15\x15'
+'\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\xcb\x15\x15\x15\x15\x15\x15\x15\xcb\xcb\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xca\xc7\xc7\xc7\xca\xca\xca\xa7\xa7\xa7\xa7\xa7'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7'
-'\xca\xc7\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xc7\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xc7\xc7\xc7\xc7\xc7\xc7\xca\xc7\xc7\xc7\xca\xca\xca\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xca\xca\x15\x15\x15\xc7\xc7\xc7\xc7\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xd2\xd2\xd2\xad\xad\xad\xad\xad'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf'
+'\xd2\xcf\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xcf\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xcf\xcf\xcf\xd2\xd2\xd2\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xd2\xd2\x15\x15\x15\xcf\xcf\xcf\xcf\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\xca\xca\xca\xca\x15\x15\x15\xca\x15\xca\xca\xca\xca'
-'\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\x15\x15\x15\x15\x15\x15'
-'\xca\xca\xca\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca\xca'
+'\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\xd2\xd2\xd2\xd2\x15\x15\x15\xd2\x15\xd2\xd2\xd2\xd2'
+'\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15'
+'\xd2\xd2\xd2\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2\xd2'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\xc7\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\xcf\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'/0//////////////////////////////////////////////////////////////'
-'////////////////////////////////////0///////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////0/////////////////////////////'
-'/////////////////////////////////0//////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////0/////////////////////'
-'////////////////////////////////////////////////////////////////'
-'///0////////0///////////////0///////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////////////0//////////////////0//'
-'/////////////////////////0//////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////0///////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////0///////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'///////////////////////////0////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/////////////////////////////////////////////0//////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'///////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
-'/////////////////////////////////////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////\x16\x16////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'//////////////////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'////////////////////////////////////////////////////////////////'
-'/////////////////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
+'1211111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111112111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111211111111111111111111111111111'
+'1111111111111111111111111111111112111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111112111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1112111111112111111111111111211111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111112111111111111111111211'
+'1111111111111111111111111211111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111211111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111112111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111112111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111112111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'11111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
+'11111111111111111111111111111111111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111111111111111111\x16\x1611111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x161111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'1111111111111111111111111111111111111111111111111111111111111111'
+'111111111111111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
 '\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
 '\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
 '\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
 '\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
-'//////////////////////////////\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
+'111111111111111111111111111111\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
 '\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
 '\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
 '\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16\x16'
@@ -62229,10 +62237,10 @@
 '\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
-'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<'
-'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<'
-'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<'
-'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
+'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'
+'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'
+'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>'
+'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15'
 '\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17'
 '\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17'
 '\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17\x17'
@@ -64468,109 +64476,6 @@
 }
 
 _special_casing_corrected = {
-223: None,
-304: None,
-329: None,
-496: None,
-912: None,
-944: None,
-1415: None,
-7830: None,
-7831: None,
-7832: None,
-7833: None,
-7834: None,
-8016: None,
-8018: None,
-8020: None,
-8022: None,
-8064: None,
-8065: None,
-8066: None,
-8067: None,
-8068: None,
-8069: None,
-8070: None,
-8071: None,
-8072: None,
-8073: None,
-8074: None,
-8075: None,
-8076: None,
-8077: None,
-8078: None,
-8079: None,
-8080: None,
-8081: None,
-8082: None,
-8083: None,
-8084: None,
-8085: None,
-8086: None,
-8087: None,
-8088: None,
-8089: None,
-8090: None,
-8091: None,
-8092: None,
-8093: None,
-8094: None,
-8095: None,
-8096: None,
-8097: None,
-8098: None,
-8099: None,
-8100: None,
-8101: None,
-8102: None,
-8103: None,
-8104: None,
-8105: None,
-8106: None,
-8107: None,
-8108: None,
-8109: None,
-8110: None,
-8111: None,
-8114: None,
-8115: None,
-8116: None,
-8118: None,
-8119: None,
-8124: None,
-8130: None,
-8131: None,
-8132: None,
-8134: None,
-8135: None,
-8140: None,
-8146: None,
-8147: None,
-8150: None,
-8151: None,
-8162: None,
-8163: None,
-8164: None,
-8166: None,
-8167: None,
-8178: None,
-8179: None,
-8180: None,
-8182: None,
-8183: None,
-8188: None,
-64256: None,
-64257: None,
-64258: None,
-64259: None,
-64260: None,
-64261: None,

From pypy.commits at gmail.com  Wed Jan  8 07:48:15 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 04:48:15 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.6
Message-ID: <5e15cf8f.1c69fb81.a89ff.ff2c@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98489:2779449dd1d5
Date: 2020-01-08 13:04 +0100
http://bitbucket.org/pypy/pypy/changeset/2779449dd1d5/

Log:	merge py3.6

diff --git a/lib-python/3/asyncio/compat.py b/lib-python/3/asyncio/compat.py
new file mode 100644
--- /dev/null
+++ b/lib-python/3/asyncio/compat.py
@@ -0,0 +1,18 @@
+"""Compatibility helpers for the different Python versions."""
+
+import sys
+
+PY34 = sys.version_info >= (3, 4)
+PY35 = sys.version_info >= (3, 5)
+PY352 = sys.version_info >= (3, 5, 2)
+
+
+def flatten_list_bytes(list_of_data):
+    """Concatenate a sequence of bytes-like objects."""
+    if not PY34:
+        # On Python 3.3 and older, bytes.join() doesn't handle
+        # memoryview.
+        list_of_data = (
+            bytes(data) if isinstance(data, memoryview) else data
+            for data in list_of_data)
+    return b''.join(list_of_data)
diff --git a/lib-python/3/asyncio/test_utils.py b/lib-python/3/asyncio/test_utils.py
new file mode 100644
--- /dev/null
+++ b/lib-python/3/asyncio/test_utils.py
@@ -0,0 +1,537 @@
+"""Utilities shared by tests."""
+
+import collections
+import contextlib
+import io
+import logging
+import os
+import re
+import socket
+import socketserver
+import sys
+import tempfile
+import threading
+import time
+import unittest
+import weakref
+
+from unittest import mock
+
+from http.server import HTTPServer
+from wsgiref.simple_server import WSGIRequestHandler, WSGIServer
+
+try:
+    import ssl
+except ImportError:  # pragma: no cover
+    ssl = None
+
+from . import base_events
+from . import compat
+from . import events
+from . import futures
+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
+    from .windows_utils import socketpair
+else:
+    from socket import socketpair  # pragma: no cover
+
+
+def data_file(filename):
+    if hasattr(support, 'TEST_HOME_DIR'):
+        fullname = os.path.join(support.TEST_HOME_DIR, filename)
+        if os.path.isfile(fullname):
+            return fullname
+    fullname = os.path.join(os.path.dirname(os.__file__), 'test', filename)
+    if os.path.isfile(fullname):
+        return fullname
+    raise FileNotFoundError(filename)
+
+
+ONLYCERT = data_file('ssl_cert.pem')
+ONLYKEY = data_file('ssl_key.pem')
+
+
+def dummy_ssl_context():
+    if ssl is None:
+        return None
+    else:
+        return ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+
+
+def run_briefly(loop):
+    @coroutine
+    def once():
+        pass
+    gen = once()
+    t = loop.create_task(gen)
+    # Don't log a warning if the task is not done after run_until_complete().
+    # It occurs if the loop is stopped or if a task raises a BaseException.
+    t._log_destroy_pending = False
+    try:
+        loop.run_until_complete(t)
+    finally:
+        gen.close()
+
+
+def run_until(loop, pred, timeout=30):
+    deadline = time.time() + timeout
+    while not pred():
+        if timeout is not None:
+            timeout = deadline - time.time()
+            if timeout <= 0:
+                raise futures.TimeoutError()
+        loop.run_until_complete(tasks.sleep(0.001, loop=loop))
+
+
+def run_once(loop):
+    """Legacy API to run once through the event loop.
+
+    This is the recommended pattern for test code.  It will poll the
+    selector once and run all callbacks scheduled in response to I/O
+    events.
+    """
+    loop.call_soon(loop.stop)
+    loop.run_forever()
+
+
+class SilentWSGIRequestHandler(WSGIRequestHandler):
+
+    def get_stderr(self):
+        return io.StringIO()
+
+    def log_message(self, format, *args):
+        pass
+
+
+class SilentWSGIServer(WSGIServer):
+
+    request_timeout = 2
+
+    def get_request(self):
+        request, client_addr = super().get_request()
+        request.settimeout(self.request_timeout)
+        return request, client_addr
+
+    def handle_error(self, request, client_address):
+        pass
+
+
+class SSLWSGIServerMixin:
+
+    def finish_request(self, request, client_address):
+        # The relative location of our test directory (which
+        # contains the ssl key and certificate files) differs
+        # between the stdlib and stand-alone asyncio.
+        # Prefer our own if we can find it.
+        keyfile = ONLYKEY
+        certfile = ONLYCERT
+        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()
+        except OSError:
+            # maybe socket has been closed by peer
+            pass
+
+
+class SSLWSGIServer(SSLWSGIServerMixin, SilentWSGIServer):
+    pass
+
+
+def _run_test_server(*, address, use_ssl=False, server_cls, server_ssl_cls):
+
+    def app(environ, start_response):
+        status = '200 OK'
+        headers = [('Content-type', 'text/plain')]
+        start_response(status, headers)
+        return [b'Test message']
+
+    # Run the test WSGI server in a separate thread in order not to
+    # interfere with event handling in the main thread
+    server_class = server_ssl_cls if use_ssl else server_cls
+    httpd = server_class(address, SilentWSGIRequestHandler)
+    httpd.set_app(app)
+    httpd.address = httpd.server_address
+    server_thread = threading.Thread(
+        target=lambda: httpd.serve_forever(poll_interval=0.05))
+    server_thread.start()
+    try:
+        yield httpd
+    finally:
+        httpd.shutdown()
+        httpd.server_close()
+        server_thread.join()
+
+
+if hasattr(socket, 'AF_UNIX'):
+
+    class UnixHTTPServer(socketserver.UnixStreamServer, HTTPServer):
+
+        def server_bind(self):
+            socketserver.UnixStreamServer.server_bind(self)
+            self.server_name = '127.0.0.1'
+            self.server_port = 80
+
+
+    class UnixWSGIServer(UnixHTTPServer, WSGIServer):
+
+        request_timeout = 2
+
+        def server_bind(self):
+            UnixHTTPServer.server_bind(self)
+            self.setup_environ()
+
+        def get_request(self):
+            request, client_addr = super().get_request()
+            request.settimeout(self.request_timeout)
+            # Code in the stdlib expects that get_request
+            # will return a socket and a tuple (host, port).
+            # However, this isn't true for UNIX sockets,
+            # as the second return value will be a path;
+            # hence we return some fake data sufficient
+            # to get the tests going
+            return request, ('127.0.0.1', '')
+
+
+    class SilentUnixWSGIServer(UnixWSGIServer):
+
+        def handle_error(self, request, client_address):
+            pass
+
+
+    class UnixSSLWSGIServer(SSLWSGIServerMixin, SilentUnixWSGIServer):
+        pass
+
+
+    def gen_unix_socket_path():
+        with tempfile.NamedTemporaryFile() as file:
+            return file.name
+
+
+    @contextlib.contextmanager
+    def unix_socket_path():
+        path = gen_unix_socket_path()
+        try:
+            yield path
+        finally:
+            try:
+                os.unlink(path)
+            except OSError:
+                pass
+
+
+    @contextlib.contextmanager
+    def run_test_unix_server(*, use_ssl=False):
+        with unix_socket_path() as path:
+            yield from _run_test_server(address=path, use_ssl=use_ssl,
+                                        server_cls=SilentUnixWSGIServer,
+                                        server_ssl_cls=UnixSSLWSGIServer)
+
+
+ at contextlib.contextmanager
+def run_test_server(*, host='127.0.0.1', port=0, use_ssl=False):
+    yield from _run_test_server(address=(host, port), use_ssl=use_ssl,
+                                server_cls=SilentWSGIServer,
+                                server_ssl_cls=SSLWSGIServer)
+
+
+def make_test_protocol(base):
+    dct = {}
+    for name in dir(base):
+        if name.startswith('__') and name.endswith('__'):
+            # skip magic names
+            continue
+        dct[name] = MockCallback(return_value=None)
+    return type('TestProtocol', (base,) + base.__bases__, dct)()
+
+
+class TestSelector(selectors.BaseSelector):
+
+    def __init__(self):
+        self.keys = {}
+
+    def register(self, fileobj, events, data=None):
+        key = selectors.SelectorKey(fileobj, 0, events, data)
+        self.keys[fileobj] = key
+        return key
+
+    def unregister(self, fileobj):
+        return self.keys.pop(fileobj)
+
+    def select(self, timeout):
+        return []
+
+    def get_map(self):
+        return self.keys
+
+
+class TestLoop(base_events.BaseEventLoop):
+    """Loop for unittests.
+
+    It manages self time directly.
+    If something scheduled to be executed later then
+    on next loop iteration after all ready handlers done
+    generator passed to __init__ is calling.
+
+    Generator should be like this:
+
+        def gen():
+            ...
+            when = yield ...
+            ... = yield time_advance
+
+    Value returned by yield is absolute time of next scheduled handler.
+    Value passed to yield is time advance to move loop's time forward.
+    """
+
+    def __init__(self, gen=None):
+        super().__init__()
+
+        if gen is None:
+            def gen():
+                yield
+            self._check_on_close = False
+        else:
+            self._check_on_close = True
+
+        self._gen = gen()
+        next(self._gen)
+        self._time = 0
+        self._clock_resolution = 1e-9
+        self._timers = []
+        self._selector = TestSelector()
+
+        self.readers = {}
+        self.writers = {}
+        self.reset_counters()
+
+        self._transports = weakref.WeakValueDictionary()
+
+    def time(self):
+        return self._time
+
+    def advance_time(self, advance):
+        """Move test time forward."""
+        if advance:
+            self._time += advance
+
+    def close(self):
+        super().close()
+        if self._check_on_close:
+            try:
+                self._gen.send(0)
+            except StopIteration:
+                pass
+            else:  # pragma: no cover
+                raise AssertionError("Time generator is not finished")
+
+    def _add_reader(self, fd, callback, *args):
+        self.readers[fd] = events.Handle(callback, args, self)
+
+    def _remove_reader(self, fd):
+        self.remove_reader_count[fd] += 1
+        if fd in self.readers:
+            del self.readers[fd]
+            return True
+        else:
+            return False
+
+    def assert_reader(self, fd, callback, *args):
+        if fd not in self.readers:
+            raise AssertionError(f'fd {fd} is not registered')
+        handle = self.readers[fd]
+        if handle._callback != callback:
+            raise AssertionError(
+                f'unexpected callback: {handle._callback} != {callback}')
+        if handle._args != args:
+            raise AssertionError(
+                f'unexpected callback args: {handle._args} != {args}')
+
+    def assert_no_reader(self, fd):
+        if fd in self.readers:
+            raise AssertionError(f'fd {fd} is registered')
+
+    def _add_writer(self, fd, callback, *args):
+        self.writers[fd] = events.Handle(callback, args, self)
+
+    def _remove_writer(self, fd):
+        self.remove_writer_count[fd] += 1
+        if fd in self.writers:
+            del self.writers[fd]
+            return True
+        else:
+            return False
+
+    def assert_writer(self, fd, callback, *args):
+        assert fd in self.writers, 'fd {} is not registered'.format(fd)
+        handle = self.writers[fd]
+        assert handle._callback == callback, '{!r} != {!r}'.format(
+            handle._callback, callback)
+        assert handle._args == args, '{!r} != {!r}'.format(
+            handle._args, args)
+
+    def _ensure_fd_no_transport(self, fd):
+        try:
+            transport = self._transports[fd]
+        except KeyError:
+            pass
+        else:
+            raise RuntimeError(
+                'File descriptor {!r} is used by transport {!r}'.format(
+                    fd, transport))
+
+    def add_reader(self, fd, callback, *args):
+        """Add a reader callback."""
+        self._ensure_fd_no_transport(fd)
+        return self._add_reader(fd, callback, *args)
+
+    def remove_reader(self, fd):
+        """Remove a reader callback."""
+        self._ensure_fd_no_transport(fd)
+        return self._remove_reader(fd)
+
+    def add_writer(self, fd, callback, *args):
+        """Add a writer callback.."""
+        self._ensure_fd_no_transport(fd)
+        return self._add_writer(fd, callback, *args)
+
+    def remove_writer(self, fd):
+        """Remove a writer callback."""
+        self._ensure_fd_no_transport(fd)
+        return self._remove_writer(fd)
+
+    def reset_counters(self):
+        self.remove_reader_count = collections.defaultdict(int)
+        self.remove_writer_count = collections.defaultdict(int)
+
+    def _run_once(self):
+        super()._run_once()
+        for when in self._timers:
+            advance = self._gen.send(when)
+            self.advance_time(advance)
+        self._timers = []
+
+    def call_at(self, when, callback, *args):
+        self._timers.append(when)
+        return super().call_at(when, callback, *args)
+
+    def _process_events(self, event_list):
+        return
+
+    def _write_to_self(self):
+        pass
+
+
+def MockCallback(**kwargs):
+    return mock.Mock(spec=['__call__'], **kwargs)
+
+
+class MockPattern(str):
+    """A regex based str with a fuzzy __eq__.
+
+    Use this helper with 'mock.assert_called_with', or anywhere
+    where a regex comparison between strings is needed.
+
+    For instance:
+       mock_call.assert_called_with(MockPattern('spam.*ham'))
+    """
+    def __eq__(self, other):
+        return bool(re.search(str(self), other, re.S))
+
+
+def get_function_source(func):
+    source = events._get_function_source(func)
+    if source is None:
+        raise ValueError("unable to get the source of %r" % (func,))
+    return source
+
+
+class TestCase(unittest.TestCase):
+    @staticmethod
+    def close_loop(loop):
+        executor = loop._default_executor
+        if executor is not None:
+            executor.shutdown(wait=True)
+        loop.close()
+
+    def set_event_loop(self, loop, *, cleanup=True):
+        assert loop is not None
+        # ensure that the event loop is passed explicitly in asyncio
+        events.set_event_loop(None)
+        if cleanup:
+            self.addCleanup(self.close_loop, loop)
+
+    def new_test_loop(self, gen=None):
+        loop = TestLoop(gen)
+        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.set_event_loop(None)
+
+        # Detect CPython bug #23353: ensure that yield/yield-from is not used
+        # 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):
+            class EmptyCM:
+                def __enter__(self):
+                    pass
+                def __exit__(self, *exc):
+                    pass
+            return EmptyCM()
+
+
+ at contextlib.contextmanager
+def disable_logger():
+    """Context manager to disable asyncio logger.
+
+    For example, it can be used to ignore warnings in debug mode.
+    """
+    old_level = logger.level
+    try:
+        logger.setLevel(logging.CRITICAL+1)
+        yield
+    finally:
+        logger.setLevel(old_level)
+
+
+def mock_nonblocking_socket(proto=socket.IPPROTO_TCP, type=socket.SOCK_STREAM,
+                            family=socket.AF_INET):
+    """Create a mock of a non-blocking socket."""
+    sock = mock.MagicMock(socket.socket)
+    sock.proto = proto
+    sock.type = type
+    sock.family = family
+    sock.gettimeout.return_value = 0.0
+    return sock
+
+
+def force_legacy_ssl_support():
+    return mock.patch('asyncio.sslproto._is_sslproto_available',
+                      return_value=False)
diff --git a/lib-python/3/idlelib/_pyclbr.py b/lib-python/3/idlelib/_pyclbr.py
new file mode 100644
--- /dev/null
+++ b/lib-python/3/idlelib/_pyclbr.py
@@ -0,0 +1,402 @@
+# A private copy of 3.7.0a1 pyclbr for use by idlelib.browser
+"""Parse a Python module and describe its classes and functions.
+
+Parse enough of a Python file to recognize imports and class and
+function definitions, and to find out the superclasses of a class.
+
+The interface consists of a single function:
+    readmodule_ex(module, path=None)
+where module is the name of a Python module, and path is an optional
+list of directories where the module is to be searched.  If present,
+path is prepended to the system search path sys.path.  The return value
+is a dictionary.  The keys of the dictionary are the names of the
+classes and functions defined in the module (including classes that are
+defined via the from XXX import YYY construct).  The values are
+instances of classes Class and Function.  One special key/value pair is
+present for packages: the key '__path__' has a list as its value which
+contains the package search path.
+
+Classes and Functions have a common superclass: _Object.  Every instance
+has the following attributes:
+    module  -- name of the module;
+    name    -- name of the object;
+    file    -- file in which the object is defined;
+    lineno  -- line in the file where the object's definition starts;
+    parent  -- parent of this object, if any;
+    children -- nested objects contained in this object.
+The 'children' attribute is a dictionary mapping names to objects.
+
+Instances of Function describe functions with the attributes from _Object.
+
+Instances of Class describe classes with the attributes from _Object,
+plus the following:
+    super   -- list of super classes (Class instances if possible);
+    methods -- mapping of method names to beginning line numbers.
+If the name of a super class is not recognized, the corresponding
+entry in the list of super classes is not a class instance but a
+string giving the name of the super class.  Since import statements
+are recognized and imported modules are scanned as well, this
+shouldn't happen often.
+"""
+
+import io
+import sys
+import importlib.util
+import tokenize
+from token import NAME, DEDENT, OP
+
+__all__ = ["readmodule", "readmodule_ex", "Class", "Function"]
+
+_modules = {}  # Initialize cache of modules we've seen.
+
+
+class _Object:
+    "Informaton about Python class or function."
+    def __init__(self, module, name, file, lineno, parent):
+        self.module = module
+        self.name = name
+        self.file = file
+        self.lineno = lineno
+        self.parent = parent
+        self.children = {}
+
+    def _addchild(self, name, obj):
+        self.children[name] = obj
+
+
+class Function(_Object):
+    "Information about a Python function, including methods."
+    def __init__(self, module, name, file, lineno, parent=None):
+        _Object.__init__(self, module, name, file, lineno, parent)
+
+
+class Class(_Object):
+    "Information about a Python class."
+    def __init__(self, module, name, super, file, lineno, parent=None):
+        _Object.__init__(self, module, name, file, lineno, parent)
+        self.super = [] if super is None else super
+        self.methods = {}
+
+    def _addmethod(self, name, lineno):
+        self.methods[name] = lineno
+
+
+def _nest_function(ob, func_name, lineno):
+    "Return a Function after nesting within ob."
+    newfunc = Function(ob.module, func_name, ob.file, lineno, ob)
+    ob._addchild(func_name, newfunc)
+    if isinstance(ob, Class):
+        ob._addmethod(func_name, lineno)
+    return newfunc
+
+def _nest_class(ob, class_name, lineno, super=None):
+    "Return a Class after nesting within ob."
+    newclass = Class(ob.module, class_name, super, ob.file, lineno, ob)
+    ob._addchild(class_name, newclass)
+    return newclass
+
+def readmodule(module, path=None):
+    """Return Class objects for the top-level classes in module.
+
+    This is the original interface, before Functions were added.
+    """
+
+    res = {}
+    for key, value in _readmodule(module, path or []).items():
+        if isinstance(value, Class):
+            res[key] = value
+    return res
+
+def readmodule_ex(module, path=None):
+    """Return a dictionary with all functions and classes in module.
+
+    Search for module in PATH + sys.path.
+    If possible, include imported superclasses.
+    Do this by reading source, without importing (and executing) it.
+    """
+    return _readmodule(module, path or [])
+
+def _readmodule(module, path, inpackage=None):
+    """Do the hard work for readmodule[_ex].
+
+    If inpackage is given, it must be the dotted name of the package in
+    which we are searching for a submodule, and then PATH must be the
+    package search path; otherwise, we are searching for a top-level
+    module, and path is combined with sys.path.
+    """
+    # Compute the full module name (prepending inpackage if set).
+    if inpackage is not None:
+        fullmodule = "%s.%s" % (inpackage, module)
+    else:
+        fullmodule = module
+
+    # Check in the cache.
+    if fullmodule in _modules:
+        return _modules[fullmodule]
+
+    # Initialize the dict for this module's contents.
+    tree = {}
+
+    # Check if it is a built-in module; we don't do much for these.
+    if module in sys.builtin_module_names and inpackage is None:
+        _modules[module] = tree
+        return tree
+
+    # Check for a dotted module name.
+    i = module.rfind('.')
+    if i >= 0:
+        package = module[:i]
+        submodule = module[i+1:]
+        parent = _readmodule(package, path, inpackage)
+        if inpackage is not None:
+            package = "%s.%s" % (inpackage, package)
+        if not '__path__' in parent:
+            raise ImportError('No package named {}'.format(package))
+        return _readmodule(submodule, parent['__path__'], package)
+
+    # Search the path for the module.
+    f = None
+    if inpackage is not None:
+        search_path = path
+    else:
+        search_path = path + sys.path
+    spec = importlib.util._find_spec_from_path(fullmodule, search_path)
+    _modules[fullmodule] = tree
+    # Is module a package?
+    if spec.submodule_search_locations is not None:
+        tree['__path__'] = spec.submodule_search_locations
+    try:
+        source = spec.loader.get_source(fullmodule)
+        if source is None:
+            return tree
+    except (AttributeError, ImportError):
+        # If module is not Python source, we cannot do anything.
+        return tree
+
+    fname = spec.loader.get_filename(fullmodule)
+    return _create_tree(fullmodule, path, fname, source, tree, inpackage)
+
+
+def _create_tree(fullmodule, path, fname, source, tree, inpackage):
+    """Return the tree for a particular module.
+
+    fullmodule (full module name), inpackage+module, becomes o.module.
+    path is passed to recursive calls of _readmodule.
+    fname becomes o.file.
+    source is tokenized.  Imports cause recursive calls to _readmodule.
+    tree is {} or {'__path__': }.
+    inpackage, None or string, is passed to recursive calls of _readmodule.
+
+    The effect of recursive calls is mutation of global _modules.
+    """
+    f = io.StringIO(source)
+
+    stack = [] # Initialize stack of (class, indent) pairs.
+
+    g = tokenize.generate_tokens(f.readline)
+    try:
+        for tokentype, token, start, _end, _line in g:
+            if tokentype == DEDENT:
+                lineno, thisindent = start
+                # Close previous nested classes and defs.
+                while stack and stack[-1][1] >= thisindent:
+                    del stack[-1]
+            elif token == 'def':
+                lineno, thisindent = start
+                # Close previous nested classes and defs.
+                while stack and stack[-1][1] >= thisindent:
+                    del stack[-1]
+                tokentype, func_name, start = next(g)[0:3]
+                if tokentype != NAME:
+                    continue  # Skip def with syntax error.
+                cur_func = None
+                if stack:
+                    cur_obj = stack[-1][0]
+                    cur_func = _nest_function(cur_obj, func_name, lineno)
+                else:
+                    # It is just a function.
+                    cur_func = Function(fullmodule, func_name, fname, lineno)
+                    tree[func_name] = cur_func
+                stack.append((cur_func, thisindent))
+            elif token == 'class':
+                lineno, thisindent = start
+                # Close previous nested classes and defs.
+                while stack and stack[-1][1] >= thisindent:
+                    del stack[-1]
+                tokentype, class_name, start = next(g)[0:3]
+                if tokentype != NAME:
+                    continue # Skip class with syntax error.
+                # Parse what follows the class name.
+                tokentype, token, start = next(g)[0:3]
+                inherit = None
+                if token == '(':
+                    names = [] # Initialize list of superclasses.
+                    level = 1
+                    super = [] # Tokens making up current superclass.
+                    while True:
+                        tokentype, token, start = next(g)[0:3]
+                        if token in (')', ',') and level == 1:
+                            n = "".join(super)
+                            if n in tree:
+                                # We know this super class.
+                                n = tree[n]
+                            else:
+                                c = n.split('.')
+                                if len(c) > 1:
+                                    # Super class form is module.class:
+                                    # look in module for class.
+                                    m = c[-2]
+                                    c = c[-1]
+                                    if m in _modules:
+                                        d = _modules[m]
+                                        if c in d:
+                                            n = d[c]
+                            names.append(n)
+                            super = []
+                        if token == '(':
+                            level += 1
+                        elif token == ')':
+                            level -= 1
+                            if level == 0:
+                                break
+                        elif token == ',' and level == 1:
+                            pass
+                        # Only use NAME and OP (== dot) tokens for type name.
+                        elif tokentype in (NAME, OP) and level == 1:
+                            super.append(token)
+                        # Expressions in the base list are not supported.
+                    inherit = names
+                if stack:
+                    cur_obj = stack[-1][0]
+                    cur_class = _nest_class(
+                            cur_obj, class_name, lineno, inherit)
+                else:
+                    cur_class = Class(fullmodule, class_name, inherit,
+                                      fname, lineno)
+                    tree[class_name] = cur_class
+                stack.append((cur_class, thisindent))
+            elif token == 'import' and start[1] == 0:
+                modules = _getnamelist(g)
+                for mod, _mod2 in modules:
+                    try:
+                        # Recursively read the imported module.
+                        if inpackage is None:
+                            _readmodule(mod, path)
+                        else:
+                            try:
+                                _readmodule(mod, path, inpackage)
+                            except ImportError:
+                                _readmodule(mod, [])
+                    except:
+                        # If we can't find or parse the imported module,
+                        # too bad -- don't die here.
+                        pass
+            elif token == 'from' and start[1] == 0:
+                mod, token = _getname(g)
+                if not mod or token != "import":
+                    continue
+                names = _getnamelist(g)
+                try:
+                    # Recursively read the imported module.
+                    d = _readmodule(mod, path, inpackage)
+                except:
+                    # If we can't find or parse the imported module,
+                    # too bad -- don't die here.
+                    continue
+                # Add any classes that were defined in the imported module
+                # to our name space if they were mentioned in the list.
+                for n, n2 in names:
+                    if n in d:
+                        tree[n2 or n] = d[n]
+                    elif n == '*':
+                        # Don't add names that start with _.
+                        for n in d:
+                            if n[0] != '_':
+                                tree[n] = d[n]
+    except StopIteration:
+        pass
+
+    f.close()
+    return tree
+
+
+def _getnamelist(g):
+    """Return list of (dotted-name, as-name or None) tuples for token source g.
+
+    An as-name is the name that follows 'as' in an as clause.
+    """
+    names = []
+    while True:
+        name, token = _getname(g)
+        if not name:
+            break
+        if token == 'as':
+            name2, token = _getname(g)
+        else:
+            name2 = None
+        names.append((name, name2))
+        while token != "," and "\n" not in token:
+            token = next(g)[1]
+        if token != ",":
+            break
+    return names
+
+
+def _getname(g):
+    "Return (dotted-name or None, next-token) tuple for token source g."
+    parts = []
+    tokentype, token = next(g)[0:2]
+    if tokentype != NAME and token != '*':
+        return (None, token)
+    parts.append(token)
+    while True:
+        tokentype, token = next(g)[0:2]
+        if token != '.':
+            break
+        tokentype, token = next(g)[0:2]
+        if tokentype != NAME:
+            break
+        parts.append(token)
+    return (".".join(parts), token)
+
+
+def _main():
+    "Print module output (default this file) for quick visual check."
+    import os
+    try:
+        mod = sys.argv[1]
+    except:
+        mod = __file__
+    if os.path.exists(mod):
+        path = [os.path.dirname(mod)]
+        mod = os.path.basename(mod)
+        if mod.lower().endswith(".py"):
+            mod = mod[:-3]
+    else:
+        path = []
+    tree = readmodule_ex(mod, path)
+    lineno_key = lambda a: getattr(a, 'lineno', 0)
+    objs = sorted(tree.values(), key=lineno_key, reverse=True)
+    indent_level = 2
+    while objs:
+        obj = objs.pop()
+        if isinstance(obj, list):
+            # Value is a __path__ key.
+            continue
+        if not hasattr(obj, 'indent'):
+            obj.indent = 0
+
+        if isinstance(obj, _Object):
+            new_objs = sorted(obj.children.values(),
+                              key=lineno_key, reverse=True)
+            for ob in new_objs:
+                ob.indent = obj.indent + indent_level
+            objs.extend(new_objs)
+        if isinstance(obj, Class):
+            print("{}class {} {} {}"
+                  .format(' ' * obj.indent, obj.name, obj.super, obj.lineno))
+        elif isinstance(obj, Function):
+            print("{}def {} {}".format(' ' * obj.indent, obj.name, obj.lineno))
+
+if __name__ == "__main__":
+    _main()
diff --git a/lib-python/3/macurl2path.py b/lib-python/3/macurl2path.py
new file mode 100644
--- /dev/null
+++ b/lib-python/3/macurl2path.py
@@ -0,0 +1,77 @@
+"""Macintosh-specific module for conversion between pathnames and URLs.
+
+Do not import directly; use urllib instead."""
+
+import urllib.parse
+import os
+
+__all__ = ["url2pathname","pathname2url"]
+
+def url2pathname(pathname):
+    """OS-specific conversion from a relative URL of the 'file' scheme
+    to a file system path; not recommended for general use."""
+    #
+    # XXXX The .. handling should be fixed...
+    #
+    tp = urllib.parse.splittype(pathname)[0]
+    if tp and tp != 'file':
+        raise RuntimeError('Cannot convert non-local URL to pathname')
+    # Turn starting /// into /, an empty hostname means current host
+    if pathname[:3] == '///':
+        pathname = pathname[2:]
+    elif pathname[:2] == '//':
+        raise RuntimeError('Cannot convert non-local URL to pathname')
+    components = pathname.split('/')
+    # Remove . and embedded ..
+    i = 0
+    while i < len(components):
+        if components[i] == '.':
+            del components[i]
+        elif components[i] == '..' and i > 0 and \
+                                  components[i-1] not in ('', '..'):
+            del components[i-1:i+1]
+            i = i-1
+        elif components[i] == '' and i > 0 and components[i-1] != '':
+            del components[i]
+        else:
+            i = i+1
+    if not components[0]:
+        # Absolute unix path, don't start with colon
+        rv = ':'.join(components[1:])
+    else:
+        # relative unix path, start with colon. First replace
+        # leading .. by empty strings (giving ::file)
+        i = 0
+        while i < len(components) and components[i] == '..':
+            components[i] = ''
+            i = i + 1
+        rv = ':' + ':'.join(components)
+    # and finally unquote slashes and other funny characters
+    return urllib.parse.unquote(rv)
+
+def pathname2url(pathname):
+    """OS-specific conversion from a file system path to a relative URL
+    of the 'file' scheme; not recommended for general use."""
+    if '/' in pathname:
+        raise RuntimeError("Cannot convert pathname containing slashes")
+    components = pathname.split(':')
+    # Remove empty first and/or last component
+    if components[0] == '':
+        del components[0]
+    if components[-1] == '':
+        del components[-1]
+    # Replace empty string ('::') by .. (will result in '/../' later)
+    for i in range(len(components)):
+        if components[i] == '':
+            components[i] = '..'
+    # Truncate names longer than 31 bytes
+    components = map(_pncomp2url, components)
+
+    if os.path.isabs(pathname):
+        return '/' + '/'.join(components)
+    else:
+        return '/'.join(components)
+
+def _pncomp2url(component):
+    # We want to quote slashes
+    return urllib.parse.quote(component[:31], safe='')
diff --git a/lib-python/3/test/bisect.py b/lib-python/3/test/bisect.py
new file mode 100755
--- /dev/null
+++ b/lib-python/3/test/bisect.py
@@ -0,0 +1,167 @@
+#!/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("Writing %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: continuing with this subtest")
+                tests = subtests
+                output = write_output(args.output, tests)
+            else:
+                print("Tests succeeded: skipping this subtest, trying a new subset")
+            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-python/3/test/pystone.py b/lib-python/3/test/pystone.py
new file mode 100755
--- /dev/null
+++ b/lib-python/3/test/pystone.py
@@ -0,0 +1,277 @@
+#! /usr/bin/env python3
+
+"""
+"PYSTONE" Benchmark Program
+
+Version:        Python/1.2 (corresponds to C/1.1 plus 3 Pystone fixes)
+
+Author:         Reinhold P. Weicker,  CACM Vol 27, No 10, 10/84 pg. 1013.
+
+                Translated from ADA to C by Rick Richardson.
+                Every method to preserve ADA-likeness has been used,
+                at the expense of C-ness.
+
+                Translated from C to Python by Guido van Rossum.
+
+Version History:
+
+                Version 1.1 corrects two bugs in version 1.0:
+
+                First, it leaked memory: in Proc1(), NextRecord ends
+                up having a pointer to itself.  I have corrected this
+                by zapping NextRecord.PtrComp at the end of Proc1().
+
+                Second, Proc3() used the operator != to compare a
+                record to None.  This is rather inefficient and not
+                true to the intention of the original benchmark (where
+                a pointer comparison to None is intended; the !=
+                operator attempts to find a method __cmp__ to do value
+                comparison of the record).  Version 1.1 runs 5-10
+                percent faster than version 1.0, so benchmark figures
+                of different versions can't be compared directly.
+
+                Version 1.2 changes the division to floor division.
+
+                Under Python 3 version 1.1 would use the normal division
+                operator, resulting in some of the operations mistakenly
+                yielding floats. Version 1.2 instead uses floor division
+                making the benchmark an integer benchmark again.
+
+"""
+
+LOOPS = 50000
+
+from time import time
+
+__version__ = "1.2"
+
+[Ident1, Ident2, Ident3, Ident4, Ident5] = range(1, 6)
+
+class Record:
+
+    def __init__(self, PtrComp = None, Discr = 0, EnumComp = 0,
+                       IntComp = 0, StringComp = 0):
+        self.PtrComp = PtrComp
+        self.Discr = Discr
+        self.EnumComp = EnumComp
+        self.IntComp = IntComp
+        self.StringComp = StringComp
+
+    def copy(self):
+        return Record(self.PtrComp, self.Discr, self.EnumComp,
+                      self.IntComp, self.StringComp)
+
+TRUE = 1
+FALSE = 0
+
+def main(loops=LOOPS):
+    benchtime, stones = pystones(loops)
+    print("Pystone(%s) time for %d passes = %g" % \
+          (__version__, loops, benchtime))
+    print("This machine benchmarks at %g pystones/second" % stones)
+
+
+def pystones(loops=LOOPS):
+    return Proc0(loops)
+
+IntGlob = 0
+BoolGlob = FALSE
+Char1Glob = '\0'
+Char2Glob = '\0'
+Array1Glob = [0]*51
+Array2Glob = [x[:] for x in [Array1Glob]*51]
+PtrGlb = None
+PtrGlbNext = None
+
+def Proc0(loops=LOOPS):
+    global IntGlob
+    global BoolGlob
+    global Char1Glob
+    global Char2Glob
+    global Array1Glob
+    global Array2Glob
+    global PtrGlb
+    global PtrGlbNext
+
+    starttime = time()
+    for i in range(loops):
+        pass
+    nulltime = time() - starttime
+
+    PtrGlbNext = Record()
+    PtrGlb = Record()
+    PtrGlb.PtrComp = PtrGlbNext
+    PtrGlb.Discr = Ident1
+    PtrGlb.EnumComp = Ident3
+    PtrGlb.IntComp = 40
+    PtrGlb.StringComp = "DHRYSTONE PROGRAM, SOME STRING"
+    String1Loc = "DHRYSTONE PROGRAM, 1'ST STRING"
+    Array2Glob[8][7] = 10
+
+    starttime = time()
+
+    for i in range(loops):
+        Proc5()
+        Proc4()
+        IntLoc1 = 2
+        IntLoc2 = 3
+        String2Loc = "DHRYSTONE PROGRAM, 2'ND STRING"
+        EnumLoc = Ident2
+        BoolGlob = not Func2(String1Loc, String2Loc)
+        while IntLoc1 < IntLoc2:
+            IntLoc3 = 5 * IntLoc1 - IntLoc2
+            IntLoc3 = Proc7(IntLoc1, IntLoc2)
+            IntLoc1 = IntLoc1 + 1
+        Proc8(Array1Glob, Array2Glob, IntLoc1, IntLoc3)
+        PtrGlb = Proc1(PtrGlb)
+        CharIndex = 'A'
+        while CharIndex <= Char2Glob:
+            if EnumLoc == Func1(CharIndex, 'C'):
+                EnumLoc = Proc6(Ident1)
+            CharIndex = chr(ord(CharIndex)+1)
+        IntLoc3 = IntLoc2 * IntLoc1
+        IntLoc2 = IntLoc3 // IntLoc1
+        IntLoc2 = 7 * (IntLoc3 - IntLoc2) - IntLoc1
+        IntLoc1 = Proc2(IntLoc1)
+
+    benchtime = time() - starttime - nulltime
+    if benchtime == 0.0:
+        loopsPerBenchtime = 0.0
+    else:
+        loopsPerBenchtime = (loops / benchtime)
+    return benchtime, loopsPerBenchtime
+
+def Proc1(PtrParIn):
+    PtrParIn.PtrComp = NextRecord = PtrGlb.copy()
+    PtrParIn.IntComp = 5
+    NextRecord.IntComp = PtrParIn.IntComp
+    NextRecord.PtrComp = PtrParIn.PtrComp
+    NextRecord.PtrComp = Proc3(NextRecord.PtrComp)
+    if NextRecord.Discr == Ident1:
+        NextRecord.IntComp = 6
+        NextRecord.EnumComp = Proc6(PtrParIn.EnumComp)
+        NextRecord.PtrComp = PtrGlb.PtrComp
+        NextRecord.IntComp = Proc7(NextRecord.IntComp, 10)
+    else:
+        PtrParIn = NextRecord.copy()
+    NextRecord.PtrComp = None
+    return PtrParIn
+
+def Proc2(IntParIO):
+    IntLoc = IntParIO + 10
+    while 1:
+        if Char1Glob == 'A':
+            IntLoc = IntLoc - 1
+            IntParIO = IntLoc - IntGlob
+            EnumLoc = Ident1
+        if EnumLoc == Ident1:
+            break
+    return IntParIO
+
+def Proc3(PtrParOut):
+    global IntGlob
+
+    if PtrGlb is not None:
+        PtrParOut = PtrGlb.PtrComp
+    else:
+        IntGlob = 100
+    PtrGlb.IntComp = Proc7(10, IntGlob)
+    return PtrParOut
+
+def Proc4():
+    global Char2Glob
+
+    BoolLoc = Char1Glob == 'A'
+    BoolLoc = BoolLoc or BoolGlob
+    Char2Glob = 'B'
+
+def Proc5():
+    global Char1Glob
+    global BoolGlob
+
+    Char1Glob = 'A'
+    BoolGlob = FALSE
+
+def Proc6(EnumParIn):
+    EnumParOut = EnumParIn
+    if not Func3(EnumParIn):
+        EnumParOut = Ident4
+    if EnumParIn == Ident1:
+        EnumParOut = Ident1
+    elif EnumParIn == Ident2:
+        if IntGlob > 100:
+            EnumParOut = Ident1
+        else:
+            EnumParOut = Ident4
+    elif EnumParIn == Ident3:
+        EnumParOut = Ident2
+    elif EnumParIn == Ident4:
+        pass
+    elif EnumParIn == Ident5:
+        EnumParOut = Ident3
+    return EnumParOut
+
+def Proc7(IntParI1, IntParI2):
+    IntLoc = IntParI1 + 2
+    IntParOut = IntParI2 + IntLoc
+    return IntParOut
+
+def Proc8(Array1Par, Array2Par, IntParI1, IntParI2):
+    global IntGlob
+
+    IntLoc = IntParI1 + 5
+    Array1Par[IntLoc] = IntParI2
+    Array1Par[IntLoc+1] = Array1Par[IntLoc]
+    Array1Par[IntLoc+30] = IntLoc
+    for IntIndex in range(IntLoc, IntLoc+2):
+        Array2Par[IntLoc][IntIndex] = IntLoc
+    Array2Par[IntLoc][IntLoc-1] = Array2Par[IntLoc][IntLoc-1] + 1
+    Array2Par[IntLoc+20][IntLoc] = Array1Par[IntLoc]
+    IntGlob = 5
+
+def Func1(CharPar1, CharPar2):
+    CharLoc1 = CharPar1
+    CharLoc2 = CharLoc1
+    if CharLoc2 != CharPar2:
+        return Ident1
+    else:
+        return Ident2
+
+def Func2(StrParI1, StrParI2):
+    IntLoc = 1
+    while IntLoc <= 1:
+        if Func1(StrParI1[IntLoc], StrParI2[IntLoc+1]) == Ident1:
+            CharLoc = 'A'
+            IntLoc = IntLoc + 1
+    if CharLoc >= 'W' and CharLoc <= 'Z':
+        IntLoc = 7
+    if CharLoc == 'X':
+        return TRUE
+    else:
+        if StrParI1 > StrParI2:
+            IntLoc = IntLoc + 7
+            return TRUE
+        else:
+            return FALSE
+
+def Func3(EnumParIn):
+    EnumLoc = EnumParIn
+    if EnumLoc == Ident3: return TRUE
+    return FALSE
+
+if __name__ == '__main__':
+    import sys
+    def error(msg):
+        print(msg, end=' ', file=sys.stderr)
+        print("usage: %s [number_of_loops]" % sys.argv[0], file=sys.stderr)
+        sys.exit(100)
+    nargs = len(sys.argv) - 1
+    if nargs > 1:
+        error("%d arguments are too many;" % nargs)
+    elif nargs == 1:
+        try: loops = int(sys.argv[1])
+        except ValueError:
+            error("Invalid argument %r;" % sys.argv[1])
+    else:
+        loops = LOOPS
+    main(loops)
diff --git a/lib-python/3/test/test_macurl2path.py b/lib-python/3/test/test_macurl2path.py
new file mode 100644
--- /dev/null
+++ b/lib-python/3/test/test_macurl2path.py
@@ -0,0 +1,31 @@
+import macurl2path
+import unittest
+
+class MacUrl2PathTestCase(unittest.TestCase):
+    def test_url2pathname(self):
+        self.assertEqual(":index.html", macurl2path.url2pathname("index.html"))
+        self.assertEqual(":bar:index.html", macurl2path.url2pathname("bar/index.html"))
+        self.assertEqual("foo:bar:index.html", macurl2path.url2pathname("/foo/bar/index.html"))
+        self.assertEqual("foo:bar", macurl2path.url2pathname("/foo/bar/"))
+        self.assertEqual("", macurl2path.url2pathname("/"))
+        self.assertRaises(RuntimeError, macurl2path.url2pathname, "http://foo.com")
+        self.assertEqual("index.html", macurl2path.url2pathname("///index.html"))
+        self.assertRaises(RuntimeError, macurl2path.url2pathname, "//index.html")
+        self.assertEqual(":index.html", macurl2path.url2pathname("./index.html"))
+        self.assertEqual(":index.html", macurl2path.url2pathname("foo/../index.html"))
+        self.assertEqual("::index.html", macurl2path.url2pathname("../index.html"))
+
+    def test_pathname2url(self):
+        self.assertEqual("drive", macurl2path.pathname2url("drive:"))
+        self.assertEqual("drive/dir", macurl2path.pathname2url("drive:dir:"))
+        self.assertEqual("drive/dir/file", macurl2path.pathname2url("drive:dir:file"))
+        self.assertEqual("drive/file", macurl2path.pathname2url("drive:file"))
+        self.assertEqual("file", macurl2path.pathname2url("file"))
+        self.assertEqual("file", macurl2path.pathname2url(":file"))
+        self.assertEqual("dir", macurl2path.pathname2url(":dir:"))
+        self.assertEqual("dir/file", macurl2path.pathname2url(":dir:file"))
+        self.assertRaises(RuntimeError, macurl2path.pathname2url, "/")
+        self.assertEqual("dir/../file", macurl2path.pathname2url("dir::file"))
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/pypy/interpreter/test/test_nestedscope.py b/pypy/interpreter/test/apptest_nestedscope.py
rename from pypy/interpreter/test/test_nestedscope.py
rename to pypy/interpreter/test/apptest_nestedscope.py
--- a/pypy/interpreter/test/test_nestedscope.py
+++ b/pypy/interpreter/test/apptest_nestedscope.py
@@ -1,171 +1,169 @@
+from pytest import raises
 
+def test_nested_scope():
+    x = 42
+    def f(): return x
+    assert f() == 42
 
-class AppTestNestedScope:
+def test_nested_scope2():
+    x = 42
+    y = 3
+    def f(): return x
+    assert f() == 42
 
-    def test_nested_scope(self):
-        x = 42
-        def f(): return x
-        assert f() == 42
+def test_nested_scope3():
+    x = 42
+    def f():
+        def g():
+            return x
+        return g
+    assert f()() == 42
 
-    def test_nested_scope2(self):
-        x = 42
-        y = 3
-        def f(): return x
-        assert f() == 42
+def test_nested_scope4():
+    def f():
+        x = 3
+        def g():
+            return x
+        a = g()
+        x = 4
+        b = g()
+        return (a, b)
+    assert f() == (3, 4)
 
-    def test_nested_scope3(self):
-        x = 42
-        def f():
-            def g():
-                return x
-            return g
-        assert f()() == 42
+def test_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            i = x
+            return locals()
+        return g()
+    d = f()
+    assert d == {'i':3, 'x':3}
 
-    def test_nested_scope4(self):
-        def f():
-            x = 3
-            def g():
-                return x
-            a = g()
-            x = 4
-            b = g()
-            return (a, b)
-        assert f() == (3, 4)
-
-    def test_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
+def test_deeply_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            def h():
                 i = x
                 return locals()
-            return g()
-        d = f()
-        assert d == {'i':3, 'x':3}
+            return locals(), h()
+        return g()
+    outer_locals, inner_locals = f()
+    assert inner_locals == {'i':3, 'x':3}
+    keys = sorted(outer_locals.keys())
+    assert keys == ['h', 'x']
 
-    def test_deeply_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
-                def h():
-                    i = x
-                    return locals()
-                return locals(), h()
-            return g()
-        outer_locals, inner_locals = f()
-        assert inner_locals == {'i':3, 'x':3}
-        keys = sorted(outer_locals.keys())
-        assert keys == ['h', 'x']
+def test_lambda_in_genexpr():
+    assert [x() for x in (lambda: x for x in range(10))] == list(range(10))
 
-    def test_lambda_in_genexpr(self):
-        assert [x() for x in (lambda: x for x in range(10))] == list(range(10))
+def test_cell_repr():
+    import re
+    from reprlib import repr as r # Don't shadow builtin repr
 
-    def test_cell_repr(self):
-        import re
-        from reprlib import repr as r # Don't shadow builtin repr
+    def get_cell():
+        x = 42
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+    assert re.match(r'', r(x))
 
-        def get_cell():
+    def get_cell():
+        if False:
             x = 42
-            def inner():
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+
+def test_cell_contents():
+    def f(x):
+        def f(y):
+            return x + y
+        return f
+
+    g = f(10)
+    assert g.__closure__[0].cell_contents == 10
+
+def test_empty_cell_contents():
+
+    def f():
+        def f(y):
+            return x + y
+        return f
+        x = 1
+
+    g = f()
+    with raises(ValueError):
+        g.__closure__[0].cell_contents
+
+def test_compare_cells():
+    def f(n):
+        if n:
+            x = n
+        def f(y):
+            return x + y
+        return f
+
+    empty_cell_1 = f(0).__closure__[0]
+    empty_cell_2 = f(0).__closure__[0]
+    g1 = f(1).__closure__[0]
+    g2 = f(2).__closure__[0]
+    assert g1 < g2
+    assert g1 <= g2
+    assert g2 > g1
+    assert g2 >= g1
+    assert not g1 == g2
+    assert g1 != g2
+    #
+    assert empty_cell_1 == empty_cell_2
+    assert not empty_cell_1 != empty_cell_2
+    assert empty_cell_1 < g1
+
+def test_leaking_class_locals():
+    def f(x):
+        class X:
+            x = 12
+            def f(self):
                 return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
-        assert re.match(r'', r(x))
+            locals()
+        return X
+    assert f(1).x == 12
 
-        def get_cell():
-            if False:
-                x = 42
-            def inner():
-                return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
+def test_nested_scope_locals_mutating_cellvars():
+    def f():
+        x = 12
+        def m():
+            locals()
+            x
+            locals()
+            return x
+        return m
+    assert f()() == 12
 
-    def test_cell_contents(self):
-        def f(x):
-            def f(y):
-                return x + y
-            return f
 
-        g = f(10)
-        assert g.__closure__[0].cell_contents == 10
+def test_unbound_local_after_del():
+    """
+    # #4617: It is now legal to delete a cell variable.
+    # The following functions must obviously compile,
+    # and give the correct error when accessing the deleted name.
+    def errorInOuter():
+        y = 1
+        del y
+        print(y)
+        def inner():
+            return y
 
-    def test_empty_cell_contents(self):
+    def errorInInner():
+        def inner():
+            return y
+        y = 1
+        del y
+        inner()
 
-        def f():
-            def f(y):
-                return x + y
-            return f
-            x = 1
-
-        g = f()
-        with raises(ValueError):
-            g.__closure__[0].cell_contents
-
-    def test_compare_cells(self):
-        def f(n):
-            if n:
-                x = n
-            def f(y):
-                return x + y
-            return f
-
-        empty_cell_1 = f(0).__closure__[0]
-        empty_cell_2 = f(0).__closure__[0]
-        g1 = f(1).__closure__[0]
-        g2 = f(2).__closure__[0]
-        assert g1 < g2
-        assert g1 <= g2
-        assert g2 > g1
-        assert g2 >= g1
-        assert not g1 == g2
-        assert g1 != g2
-        #
-        assert empty_cell_1 == empty_cell_2
-        assert not empty_cell_1 != empty_cell_2
-        assert empty_cell_1 < g1
-
-    def test_leaking_class_locals(self):
-        def f(x):
-            class X:
-                x = 12
-                def f(self):
-                    return x
-                locals()
-            return X
-        assert f(1).x == 12
-
-    def test_nested_scope_locals_mutating_cellvars(self):
-        def f():
-            x = 12
-            def m():
-                locals()
-                x
-                locals()
-                return x
-            return m
-        assert f()() == 12
-
-
-    def test_unbound_local_after_del(self):
-        """
-        # #4617: It is now legal to delete a cell variable.
-        # The following functions must obviously compile,
-        # and give the correct error when accessing the deleted name.
-        def errorInOuter():
-            y = 1
-            del y
-            print(y)
-            def inner():
-                return y
-
-        def errorInInner():
-            def inner():
-                return y
-            y = 1
-            del y
-            inner()
-
-        raises(UnboundLocalError, "errorInOuter()")
-        raises(NameError, "errorInInner()")
-        """
+    raises(UnboundLocalError, "errorInOuter()")
+    raises(NameError, "errorInInner()")
+    """

From pypy.commits at gmail.com  Wed Jan  8 07:48:18 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 04:48:18 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: make cell contents writable
Message-ID: <5e15cf92.1c69fb81.53b4a.02fb@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98490:1787f589a543
Date: 2020-01-08 13:23 +0100
http://bitbucket.org/pypy/pypy/changeset/1787f589a543/

Log:	make cell contents writable

diff --git a/pypy/interpreter/nestedscope.py b/pypy/interpreter/nestedscope.py
--- a/pypy/interpreter/nestedscope.py
+++ b/pypy/interpreter/nestedscope.py
@@ -85,3 +85,6 @@
             return self.get()
         except ValueError:
             raise oefmt(space.w_ValueError, "Cell is empty")
+
+    def descr_set_cell_contents(self, space, w_value):
+        return self.set(w_value)
diff --git a/pypy/interpreter/test/apptest_nestedscope.py b/pypy/interpreter/test/apptest_nestedscope.py
--- a/pypy/interpreter/test/apptest_nestedscope.py
+++ b/pypy/interpreter/test/apptest_nestedscope.py
@@ -88,6 +88,19 @@
     g = f(10)
     assert g.__closure__[0].cell_contents == 10
 
+def test_set_cell_contents():
+    def f(x):
+        def g(y):
+            return x + y
+        return g
+
+    g10 = f(10)
+    assert g10(5) == 15
+    assert g10.__closure__[0].cell_contents == 10
+    g10.__closure__[0].cell_contents = 20
+    assert g10.__closure__[0].cell_contents == 20
+    assert g10(5) == 25
+
 def test_empty_cell_contents():
 
     def f():
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -943,7 +943,7 @@
     __reduce__   = interp2app(Cell.descr__reduce__),
     __repr__     = interp2app(Cell.descr__repr__),
     __setstate__ = interp2app(Cell.descr__setstate__),
-    cell_contents= GetSetProperty(Cell.descr__cell_contents, cls=Cell),
+    cell_contents= GetSetProperty(Cell.descr__cell_contents, Cell.descr_set_cell_contents, cls=Cell),
 )
 assert not Cell.typedef.acceptable_as_base_class  # no __new__
 

From pypy.commits at gmail.com  Wed Jan  8 07:48:20 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 04:48:20 -0800 (PST)
Subject: [pypy-commit] pypy default: run functions in apptest_* files in
 definition order
Message-ID: <5e15cf94.1c69fb81.b5f90.3064@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98491:d7bd679b8a6e
Date: 2020-01-08 13:24 +0100
http://bitbucket.org/pypy/pypy/changeset/d7bd679b8a6e/

Log:	run functions in apptest_* files in definition order

diff --git a/pypy/tool/pytest/apptest2.py b/pypy/tool/pytest/apptest2.py
--- a/pypy/tool/pytest/apptest2.py
+++ b/pypy/tool/pytest/apptest2.py
@@ -46,6 +46,7 @@
             if not isinstance(w_obj, pypy.interpreter.function.Function):
                 continue
             items.append(AppTestFunction(name, self, w_obj))
+        items.sort(key=lambda item: item.reportinfo()[:2])
         return items
 
     def setup(self):

From pypy.commits at gmail.com  Wed Jan  8 08:06:27 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 05:06:27 -0800 (PST)
Subject: [pypy-commit] pypy default: test for the problem in e300fd927c59
Message-ID: <5e15d3d3.1c69fb81.d872c.188f@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98492:4c97894c1026
Date: 2020-01-08 14:01 +0100
http://bitbucket.org/pypy/pypy/changeset/4c97894c1026/

Log:	test for the problem in e300fd927c59

diff --git a/pypy/module/itertools/test/test_itertools.py b/pypy/module/itertools/test/test_itertools.py
--- a/pypy/module/itertools/test/test_itertools.py
+++ b/pypy/module/itertools/test/test_itertools.py
@@ -645,6 +645,16 @@
         assert a == []
         assert b == [(True, 9)]
 
+    def test_groupby_crash(self):
+        # see http://bugs.python.org/issue30347
+        from itertools import groupby
+        def f(n):
+            if n == 5:
+                list(b)
+            return n != 6
+        for (k, b) in groupby(range(10), f):
+            list(b)  # shouldn't crash
+
     def test_iterables(self):
         import itertools
 

From pypy.commits at gmail.com  Wed Jan  8 08:06:29 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 05:06:29 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: merge default
Message-ID: <5e15d3d5.1c69fb81.73bba.0618@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98493:66a00f2388c3
Date: 2020-01-08 14:05 +0100
http://bitbucket.org/pypy/pypy/changeset/66a00f2388c3/

Log:	merge default

diff --git a/pypy/module/itertools/test/test_itertools.py b/pypy/module/itertools/test/test_itertools.py
--- a/pypy/module/itertools/test/test_itertools.py
+++ b/pypy/module/itertools/test/test_itertools.py
@@ -541,6 +541,16 @@
         assert a == []
         assert b == [(True, 9)]
 
+    def test_groupby_crash(self):
+        # see http://bugs.python.org/issue30347
+        from itertools import groupby
+        def f(n):
+            if n == 5:
+                list(b)
+            return n != 6
+        for (k, b) in groupby(range(10), f):
+            list(b)  # shouldn't crash
+
     def test_iterables(self):
         import itertools
 
diff --git a/pypy/tool/pytest/apptest2.py b/pypy/tool/pytest/apptest2.py
--- a/pypy/tool/pytest/apptest2.py
+++ b/pypy/tool/pytest/apptest2.py
@@ -46,6 +46,7 @@
             if not isinstance(w_obj, pypy.interpreter.function.Function):
                 continue
             items.append(AppTestFunction(name, self, w_obj))
+        items.sort(key=lambda item: item.reportinfo()[:2])
         return items
 
     def setup(self):

From pypy.commits at gmail.com  Wed Jan  8 08:06:31 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 05:06:31 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: re-do e300fd927c59 which got lost in a
 merge somewhere
Message-ID: <5e15d3d7.1c69fb81.dec0c.30ae@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98494:8ab16affda0a
Date: 2020-01-08 14:05 +0100
http://bitbucket.org/pypy/pypy/changeset/8ab16affda0a/

Log:	re-do e300fd927c59 which got lost in a merge somewhere

diff --git a/pypy/module/itertools/interp_itertools.py b/pypy/module/itertools/interp_itertools.py
--- a/pypy/module/itertools/interp_itertools.py
+++ b/pypy/module/itertools/interp_itertools.py
@@ -1068,7 +1068,8 @@
                 w_newkey = w_newvalue
             else:
                 w_newkey = space.call_function(groupby.w_keyfunc, w_newvalue)
-            assert groupby.w_currvalue is None
+            #assert groupby.w_currvalue is None
+            # ^^^ check disabled, see http://bugs.python.org/issue30347
             groupby.w_currkey = w_newkey
             groupby.w_currvalue = w_newvalue
 

From pypy.commits at gmail.com  Wed Jan  8 08:06:33 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 08 Jan 2020 05:06:33 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.6
Message-ID: <5e15d3d9.1c69fb81.84682.0da7@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98495:9d31a887ead7
Date: 2020-01-08 14:05 +0100
http://bitbucket.org/pypy/pypy/changeset/9d31a887ead7/

Log:	merge py3.6

diff --git a/pypy/module/itertools/interp_itertools.py b/pypy/module/itertools/interp_itertools.py
--- a/pypy/module/itertools/interp_itertools.py
+++ b/pypy/module/itertools/interp_itertools.py
@@ -1071,7 +1071,8 @@
                 w_newkey = w_newvalue
             else:
                 w_newkey = space.call_function(groupby.w_keyfunc, w_newvalue)
-            assert groupby.w_currvalue is None
+            #assert groupby.w_currvalue is None
+            # ^^^ check disabled, see http://bugs.python.org/issue30347
             groupby.w_currkey = w_newkey
             groupby.w_currvalue = w_newvalue
 
diff --git a/pypy/module/itertools/test/test_itertools.py b/pypy/module/itertools/test/test_itertools.py
--- a/pypy/module/itertools/test/test_itertools.py
+++ b/pypy/module/itertools/test/test_itertools.py
@@ -553,6 +553,16 @@
         assert a == []
         assert b == [(True, 9)]
 
+    def test_groupby_crash(self):
+        # see http://bugs.python.org/issue30347
+        from itertools import groupby
+        def f(n):
+            if n == 5:
+                list(b)
+            return n != 6
+        for (k, b) in groupby(range(10), f):
+            list(b)  # shouldn't crash
+
     def test_iterables(self):
         import itertools
 
diff --git a/pypy/tool/pytest/apptest2.py b/pypy/tool/pytest/apptest2.py
--- a/pypy/tool/pytest/apptest2.py
+++ b/pypy/tool/pytest/apptest2.py
@@ -46,6 +46,7 @@
             if not isinstance(w_obj, pypy.interpreter.function.Function):
                 continue
             items.append(AppTestFunction(name, self, w_obj))
+        items.sort(key=lambda item: item.reportinfo()[:2])
         return items
 
     def setup(self):

From pypy.commits at gmail.com  Wed Jan  8 19:51:31 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 08 Jan 2020 16:51:31 -0800 (PST)
Subject: [pypy-commit] pypy.org nikola: adjust theme, css for header,
 footer alignment
Message-ID: <5e167913.1c69fb81.655cc.dd76@mx.google.com>

Author: Matti Picus 
Branch: nikola
Changeset: r972:2a10a45f9acf
Date: 2020-01-09 08:51 +0800
http://bitbucket.org/pypy/pypy.org/changeset/2a10a45f9acf/

Log:	adjust theme, css for header, footer alignment

diff --git a/conf.py b/conf.py
--- a/conf.py
+++ b/conf.py
@@ -137,9 +137,11 @@
 #          with a ``/``, otherwise end them with ``/index.html`` — or
 #          else they won’t be highlighted when active.
 
+# PyPy templates out the logo into a div, so it is not here
+
 NAVIGATION_LINKS = {
     DEFAULT_LANG: (
-        ('/index.html', 'PyPy'),
+        
         (
             (
                 ('/features.html', 'What is PyPy?'),
@@ -955,9 +957,15 @@
 # A small copyright notice for the page footer (in HTML).
 # (translatable)
 CONTENT_FOOTER = """
-PyPy Logo  Contents ©
-{date} {author} Powered by Nikola {license}
+
    
+  
    
+    PyPy Logo
+  
    
+  
    
+     Contents © {date} {author}
+    Powered by Nikola {license}
+  
    
+
    
 """
 
 # Things that will be passed to CONTENT_FOOTER.format().  This is done
diff --git a/public/archive.html b/public/archive.html
--- a/public/archive.html
+++ b/public/archive.html
@@ -26,10 +26,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -60,9 +63,17 @@
     
    Archive
    
     
    No posts found.
    
 
    
 
    
diff --git a/public/assets/css/styles.css b/public/assets/css/styles.css
--- a/public/assets/css/styles.css
+++ b/public/assets/css/styles.css
@@ -11,19 +11,35 @@
     background-color: #d0dad5;
 }
 
-/* Add a black background color to the top navigation */
-.topnav {
+.myTopNav {
   /* background-color: #333; */
-  overflow: hidden;
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 5px;
+  height: 47px;
 }
 
 /* Style the links inside the navigation bar */
+.myTopNav a {
+  float: left;
+  display: block;
+  text-decoration: none;
+  font-size: 17px;
+}
+
+.topnav {
+  height: 32px;
+}
+
 .topnav a {
   float: left;
   display: block;
   color: #383939;
   text-align: center;
-  padding: 14px 16px;
+  padding-top: 8px;
+  padding-left: 16px;
+  padding-right: 16px;
+  padding-bottom: 12px;
   text-decoration: none;
   font-size: 17px;
 }
@@ -35,7 +51,7 @@
 }
 
 /* Hide the link that should open and close the topnav on small screens */
-.topnav .icon {
+.myTopNav .icon {
   display: none;
 }
 
@@ -51,7 +67,10 @@
   border: none;
   outline: none;
   color: #383939;
-  padding: 14px 16px;
+  padding-top: 10px;
+  padding-left: 16px;
+  padding-right: 16px;
+  padding-bottom: 12px;
   background-color: inherit;
   font-family: inherit;
   margin: 0;
@@ -78,7 +97,7 @@
 }
 
 /* Add a dark background on topnav links and the dropdown button on hover */
-.topnav a:hover, .dropdown:hover .dropbtn {
+.myTopNav a:hover, .dropdown:hover .dropbtn {
   background-color: #555;
   color: white;
 }
@@ -96,10 +115,10 @@
 
 /* When the screen is less than 600 pixels wide, hide all links, except for the first one ("Home"). Show the link that contains should open and close the topnav (.icon) */
 @media screen and (max-width: 600px) {
-  .topnav a:not(:first-child), .dropdown .dropbtn {
+  .myTopNav a:not(:first-child), .dropdown .dropbtn {
     display: none;
   }
-  .topnav a.icon {
+  .myTopNav a.icon {
     float: right;
     display: block;
   }
@@ -107,20 +126,20 @@
 
 /* The "responsive" class is added to the topnav with JavaScript when the user clicks on the icon. This class makes the topnav look good on small screens (display the links vertically instead of horizontally) */
 @media screen and (max-width: 600px) {
-  .topnav.responsive {position: relative;}
-  .topnav.responsive a.icon {
+  .myTopNav.responsive {position: relative;}
+  .myTopNav.responsive a.icon {
     position: absolute;
     right: 0;
     top: 0;
   }
-  .topnav.responsive a {
+  .myTopNav.responsive a {
     float: none;
     display: block;
     text-align: left;
   }
-  .topnav.responsive .dropdown {float: none;}
-  .topnav.responsive .dropdown-content {position: relative;}
-  .topnav.responsive .dropdown .dropbtn {
+  .myTopNav.responsive .dropdown {float: none;}
+  .myTopNav.responsive .dropdown-content {position: relative;}
+  .myTopNav.responsive .dropdown .dropbtn {
     display: block;
     width: 100%;
     text-align: left;
@@ -198,4 +217,15 @@
     margin-bottom: 0; 
 }
 
+.myfooter {
+  overflow: auto;
+  display: flex;
+  flex-direction: row;
+}
 
+.myfooter div {
+  height: 32px;
+}
+
+.logotext {
+  padding-top: 4px;
diff --git a/public/blog/index.html b/public/blog/index.html
--- a/public/blog/index.html
+++ b/public/blog/index.html
@@ -26,10 +26,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -63,9 +66,17 @@
 
 
          
 
    
diff --git a/public/categories/index.html b/public/categories/index.html
--- a/public/categories/index.html
+++ b/public/categories/index.html
@@ -26,10 +26,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -62,9 +65,17 @@
             
         
    
     
 
    
diff --git a/public/compat.html b/public/compat.html
--- a/public/compat.html
+++ b/public/compat.html
@@ -34,10 +34,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -109,11 +112,11 @@
 not support refcounting semantics. The following code won't fill the
 file immediately, but only after a certain period of time, when the GC
 does a collection:
    
-
    open("filename", "w").write("stuff")
+
    open("filename", "w").write("stuff")
 
    
 
    The proper fix is
    
-
    with open("filename", "w") as f:
-    f.write("stuff")
+
    with open("filename", "w") as f:
+    f.write("stuff")
 
    
 
    The same problem---not closing your files---can also show up if your
 program opens a large number of files without closing them explicitly.
@@ -127,22 +130,22 @@
 
    Similarly, remember that you must close() a non-exhausted
 generator in order to have its pending finally or with
 clauses executed immediately:
    
-
    def mygen():
-    with foo:
-        yield 42
-
-for x in mygen():
-    if x == 42:
-        break    # foo.__exit__ is not run immediately!
-
-# fixed version:
-gen = mygen()
-try:
-    for x in gen:
-        if x == 42:
-            break
-finally:
-    gen.close()
+
    def mygen():
+    with foo:
+        yield 42
+
+for x in mygen():
+    if x == 42:
+        break    # foo.__exit__ is not run immediately!
+
+# fixed version:
+gen = mygen()
+try:
+    for x in gen:
+        if x == 42:
+            break
+finally:
+    gen.close()
 
    
 
    More generally, __del__() methods are not executed as predictively
 as on CPython: they run "some time later" in PyPy (or not at all if
@@ -162,9 +165,17 @@
     
    
     
 
 
    
diff --git a/public/contact.html b/public/contact.html
--- a/public/contact.html
+++ b/public/contact.html
@@ -35,10 +35,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -81,9 +84,17 @@
 
    
     
 
 
    
diff --git a/public/download.html b/public/download.html
--- a/public/download.html
+++ b/public/download.html
@@ -41,10 +41,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -257,11 +260,11 @@
 trunk using Mercurial.  The trunk usually works and is of course
 more up-to-date.  The following command should run in about 7 minutes
 nowadays if you have hg >= 3.7 (it is much slower with older versions):
    
-
    hg clone https://bitbucket.org/pypy/pypy
+
    hg clone https://bitbucket.org/pypy/pypy
 
    
 
    The trunk contains PyPy 2.  For PyPy 3, switch to the correct branch:
    
-
    # switch to the branch that implements Python 3.6
-hg update py3.6
+
    # switch to the branch that implements Python 3.6
+hg update py3.6
 
    
 
    Alternatively, get one of the following smaller packages for the source at
 the same revision as the above binaries:
    
@@ -275,19 +278,19 @@
 
    • 
 
  • 
 
    Enter the goal directory:
    
-
    cd pypy/pypy/goal
+
    cd pypy/pypy/goal
 
    
 
    • 
 
  • 
 
    Run the rpython script.  Here are the common combinations
 of options (works also with python instead of pypy;
 requires CPython 2.7 or PyPy 2, even to build PyPy 3):
    
-
    # get the JIT version
-pypy ../../rpython/bin/rpython -Ojit targetpypystandalone
-# get the no-jit version
-pypy ../../rpython/bin/rpython -O2 targetpypystandalone
-# get the sandbox version
-pypy ../../rpython/bin/rpython -O2 --sandbox targetpypystandalone
+
    # get the JIT version
+pypy ../../rpython/bin/rpython -Ojit targetpypystandalone
+# get the no-jit version
+pypy ../../rpython/bin/rpython -O2 targetpypystandalone
+# get the sandbox version
+pypy ../../rpython/bin/rpython -O2 --sandbox targetpypystandalone
 
    
 
    • 
 
  • Enjoy Mandelbrot :-)  It takes on the order of half an hour to
@@ -320,9 +323,9 @@
 call it with ...pypy-c ../../rpython/bin/rpython -Ojit.
    
 
    2. if even using PyPy instead of CPython is not enough, try to tweak
 some internal parameters.  Example (slower but saves around 400MB):
    
-
    PYPY_DONT_RUN_SUBPROCESS=1 PYPY_GC_MAX_DELTA=200MB \
-pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit --source
-# then read the next point about --source
+
    PYPY_DONT_RUN_SUBPROCESS=1 PYPY_GC_MAX_DELTA=200MB \
+pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit --source
+# then read the next point about --source
 
    
 
    • 
 
  • You can run translations with --source, which only builds the C
@@ -343,9 +346,9 @@
 
    Once PyPy is translated from source the binary package similar to those
 provided in the section Default (with a JIT Compiler) above could be
 easily created with package.py script:
    
-
    cd ./pypy/pypy/tool/release/
-python package.py --help #for information
-python package.py --archive-name pypy-my-own-package-name
+
    cd ./pypy/pypy/tool/release/
+python package.py --help #for information
+python package.py --archive-name pypy-my-own-package-name
 
    
 
    It is recommended to use package.py because custom scripts will
 invariably become out-of-date.  If you want to write custom scripts
@@ -454,9 +457,17 @@
     
     
 
    
 
diff --git a/public/features.html b/public/features.html
--- a/public/features.html
+++ b/public/features.html
@@ -33,10 +33,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -157,16 +160,16 @@
 build pypy-sandbox from it (see Building from source).  These
 instructions give you a pypy-c that you should rename to
 pypy-sandbox to avoid future confusion.  Then run:
    
-
    cd pypy/sandbox
-pypy_interact.py path/to/pypy-sandbox
-# don't confuse it with pypy/goal/pyinteractive.py!
+
    cd pypy/sandbox
+pypy_interact.py path/to/pypy-sandbox
+# don't confuse it with pypy/goal/pyinteractive.py!
 
    
 
    You get a fully sandboxed interpreter, in its own filesystem hierarchy
 (try os.listdir('/')).  For example, you would run an untrusted
 script as follows:
    
-
    mkdir virtualtmp
-cp untrusted.py virtualtmp/
-pypy_interact.py --tmp=virtualtmp pypy-sandbox /tmp/untrusted.py
+
    mkdir virtualtmp
+cp untrusted.py virtualtmp/
+pypy_interact.py --tmp=virtualtmp pypy-sandbox /tmp/untrusted.py
 
    
 
    Note that the path /tmp/untrusted.py is a path inside the sandboxed
 filesystem.  You don't have to put untrusted.py in the real /tmp
@@ -179,9 +182,17 @@
     
    
     
 
 
    
diff --git a/public/index.html b/public/index.html
--- a/public/index.html
+++ b/public/index.html
@@ -20,12 +20,15 @@
 
 
 
-
+
+On average, PyPy is 4.4 times faster than CPython
+
+
+PyP">
 
 
 
@@ -37,10 +40,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -72,20 +78,25 @@
 
         
     
    
-    
    
+    
    
+
    
 
    
 PyPy logo
    A fast, compliant alternative implementation of Python
    
 
    Get Started : Download and install
    
 
    What is PyPy : Features
    
 
    Documentation (external link)
    
-
    "If you want your code to run faster,
-you should probably just use PyPy."
--- Guido van Rossum (creator of Python)
    
-
    On average, PyPy is 4.4 times faster than CPython
    
+
    
+
    
+
    On average, PyPy is 4.4 times faster than CPython
    
 
    
 PyPy vs. Python speed comparison graph"
    PyPy trunk (with JIT) benchmark times normalized to CPython. Smaller is
 better. Based on the geometric average of all benchmarks
    
 
    
+
    
+
    
+
    "If you want your code to run faster,
+you should probably just use PyPy."
+-- Guido van Rossum (creator of Python)
    
 
    Advantages and distinct Features
    
 
      
 
    • Speed: thanks to its Just-in-Time compiler, Python programs
@@ -100,13 +111,20 @@
 
    • As well as other features.
      • 
 
    
 
    
-
    
     
    
     
 
 
    
diff --git a/public/index.rst b/public/index.rst
deleted file mode 100644
--- a/public/index.rst
+++ /dev/null
@@ -1,87 +0,0 @@
-.. title: Welcome to PyPy
-.. slug: index
-.. date: 2019-12-28 16:14:02 UTC
-.. tags: 
-.. category: 
-.. link: 
-.. description: 
-.. type: text
-
-.. raw:: html
-
-    
    
-    
    
-
-.. image:: images/pypy-logo.svg
-    :alt: PyPy logo
-    :width: 350px
-
-A `fast`_, `compliant`_ alternative implementation of `Python`_
-
-.. class:: button
-
-    `Get Started`_ : Download and install
-
-.. class:: button
-
-    `What is PyPy`_ : Features
-
-.. class:: button
-
-    `Documentation`_ (external link)
-
-.. _`Get Started`: download.html
-.. _`What is PyPy`: features.html
-.. _`Documentation`: https://doc.pypy.org
-
-
-::
-
-    "If you want your code to run faster,
-    you should probably just use PyPy."
-    -- Guido van Rossum (creator of Python)
-
-On average, PyPy is **4.4 times faster** than CPython
-
-.. figure:: images/pypy_speed_graph.png
-    :alt: PyPy vs. Python speed comparison graph"
-    :figclass: text-sm
-
-    PyPy trunk (with JIT) benchmark times normalized to CPython. Smaller is
-    better. Based on the geometric average of all benchmarks
-
-
-**Advantages and distinct Features**
-
-* **Speed:** thanks to its Just-in-Time compiler, Python programs
-  often run `faster`_ on PyPy.  `(What is a JIT compiler?)`_
-
-* **Memory usage:** memory-hungry Python programs (several hundreds of
-  MBs or more) might end up taking `less space`_ than they do in CPython.
-
-* **Compatibility:** PyPy is `highly compatible`_ with existing python code.
-  It supports `cffi`_, `cppyy`_, and can run popular python libraries like
-  `twisted`_ and `django`_.
-
-* **Stackless:** PyPy comes by default with support for `stackless mode`_,
-  providing micro-threads for massive concurrency.
-
-* As well as other `features`_.
-
-.. _`stackless mode`: features.html#stackless
-.. _`Python`: http://python.org/
-.. _`fast`: http://speed.pypy.org/
-.. _`faster`: http://speed.pypy.org/
-.. _`(What is a JIT compiler?)`: http://en.wikipedia.org/wiki/Just-in-time_compilation
-.. _`run untrusted code`: features.html#sandboxing
-.. _`compliant`: compat.html
-.. _`Python docs`: http://docs.python.org/2.7
-.. _`twisted`: https://twistedmatrix.com/
-.. _`django`: https://www.djangoproject.com/
-.. _`cffi`: https://cffi.readthedocs.org
-.. _`cppyy`: https://cppyy.readthedocs.org
-.. _`features`: features.html
-.. _`less space`: http://morepypy.blogspot.com/2009/10/gc-improvements.html
-.. _`highly compatible`: compat.html
-.. _`speed`: http://speed.pypy.org/
-.. _`compatibility`: compat.html
diff --git a/public/people.html b/public/people.html
--- a/public/people.html
+++ b/public/people.html
@@ -36,10 +36,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -187,9 +190,17 @@
     
    
     
 
 
    
diff --git a/public/performance.html b/public/performance.html
--- a/public/performance.html
+++ b/public/performance.html
@@ -40,10 +40,13 @@
     
 
         
-            
    
+            
    
     
    
-                    PyPy
-            
     
    
+    
    
+                
     
             
     
@@ -235,13 +238,13 @@
 
    
 
    String concatenation is expensive
    
 
    In CPython, you may want to replace:
    
-
    s = head + body + maybe + tail
+
    s = head + body + maybe + tail
 
    
 
    with the admittedly less readable:
    
-
    s = "%(head)s%(body)s%(maybe)s%(tail)s" % locals()
+
    s = "%(head)s%(body)s%(maybe)s%(tail)s" % locals()
 
    
 
    or even:
    
-
    s = "{head}{body}{maybe}{tail}".format(**locals())
+
    s = "{head}{body}{maybe}{tail}".format(**locals())
 
    
 
    Both of the latter forms avoid multiple-allocation overhead.
 But PyPy's JIT makes the overhead of intermediate concatenations
@@ -249,8 +252,8 @@
 small, bound and constant.  (And locals() is rather slow
 with PyPy's JIT.)
    
 
    On the other hand, in code like this with a string-valued foo() function:
    
-
    for x in mylist:
-    s += foo(x)
+
    for x in mylist:
+    s += foo(x)
 
    
 
    the JIT cannot optimize out intermediate copies.  This code is
 actually quadratic in the total size of the mylist strings due to
@@ -258,10 +261,10 @@
 is always fine for bytearrays, because in this case += is an
 in-place operation.)
    
 
    This:
    
-
    parts = []
-for x in mylist:
-    parts.append(foo(x))
-s = "".join(parts)
+
    parts = []
+for x in mylist:
+    parts.append(foo(x))
+s = "".join(parts)
 
    
 
    can be much faster because all the string concatenation in the last
 line creates exactly one new string object with one C-level copy
@@ -372,9 +375,17 @@
     
    
     
 
 
    
diff --git a/public/sitemap.xml b/public/sitemap.xml
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -7,42 +7,42 @@
                         http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
  
   https://www.pypy.org/
-  2020-01-08T08:35:00Z
+  2020-01-08T11:00:00Z
  
  
   https://www.pypy.org/archive.html
-  2020-01-08T08:33:00Z
+  2020-01-09T00:45:00Z
  
  
   https://www.pypy.org/blog/
-  2020-01-08T05:16:00Z
+  2020-01-08T11:00:00Z
  
  
   https://www.pypy.org/categories/
-  2020-01-08T05:16:00Z
+  2020-01-08T11:00:00Z
  
  
   https://www.pypy.org/compat.html
-  2020-01-08T08:33:00Z
+  2020-01-09T00:45:00Z
  
  
   https://www.pypy.org/contact.html
-  2020-01-08T08:33:00Z
+  2020-01-09T00:45:00Z
  
  
   https://www.pypy.org/download.html
-  2020-01-08T08:33:00Z
+  2020-01-09T00:45:00Z
  
  
   https://www.pypy.org/features.html
-  2020-01-08T08:33:00Z
+  2020-01-09T00:45:00Z
  
  
   https://www.pypy.org/people.html
-  2020-01-08T08:33:00Z
+  2020-01-09T00:45:00Z
  
  
   https://www.pypy.org/performance.html
-  2020-01-08T08:33:00Z
+  2020-01-09T00:45:00Z
  
 
\ No newline at end of file
diff --git a/public/sitemapindex.xml b/public/sitemapindex.xml
--- a/public/sitemapindex.xml
+++ b/public/sitemapindex.xml
@@ -7,10 +7,10 @@
                         http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
  
   https://www.pypy.org/rss.xml
-  2020-01-08T08:33:00Z
+  2020-01-08T11:00:00Z
  
  
   https://www.pypy.org/sitemap.xml
-  2020-01-08T08:35:00Z
+  2020-01-09T00:45:00Z
  
 
\ No newline at end of file
diff --git a/themes/pypy/assets/css/styles.css b/themes/pypy/assets/css/styles.css
--- a/themes/pypy/assets/css/styles.css
+++ b/themes/pypy/assets/css/styles.css
@@ -11,19 +11,35 @@
     background-color: #d0dad5;
 }
 
-/* Add a black background color to the top navigation */
-.topnav {
+.myTopNav {
   /* background-color: #333; */
-  overflow: hidden;
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 5px;
+  height: 47px;
 }
 
 /* Style the links inside the navigation bar */
+.myTopNav a {
+  float: left;
+  display: block;
+  text-decoration: none;
+  font-size: 17px;
+}
+
+.topnav {
+  height: 32px;
+}
+
 .topnav a {
   float: left;
   display: block;
   color: #383939;
   text-align: center;
-  padding: 14px 16px;
+  padding-top: 8px;
+  padding-left: 16px;
+  padding-right: 16px;
+  padding-bottom: 12px;
   text-decoration: none;
   font-size: 17px;
 }
@@ -35,7 +51,7 @@
 }
 
 /* Hide the link that should open and close the topnav on small screens */
-.topnav .icon {
+.myTopNav .icon {
   display: none;
 }
 
@@ -51,7 +67,10 @@
   border: none;
   outline: none;
   color: #383939;
-  padding: 14px 16px;
+  padding-top: 10px;
+  padding-left: 16px;
+  padding-right: 16px;
+  padding-bottom: 12px;
   background-color: inherit;
   font-family: inherit;
   margin: 0;
@@ -78,7 +97,7 @@
 }
 
 /* Add a dark background on topnav links and the dropdown button on hover */
-.topnav a:hover, .dropdown:hover .dropbtn {
+.myTopNav a:hover, .dropdown:hover .dropbtn {
   background-color: #555;
   color: white;
 }
@@ -96,10 +115,10 @@
 
 /* When the screen is less than 600 pixels wide, hide all links, except for the first one ("Home"). Show the link that contains should open and close the topnav (.icon) */
 @media screen and (max-width: 600px) {
-  .topnav a:not(:first-child), .dropdown .dropbtn {
+  .myTopNav a:not(:first-child), .dropdown .dropbtn {
     display: none;
   }
-  .topnav a.icon {
+  .myTopNav a.icon {
     float: right;
     display: block;
   }
@@ -107,20 +126,20 @@
 
 /* The "responsive" class is added to the topnav with JavaScript when the user clicks on the icon. This class makes the topnav look good on small screens (display the links vertically instead of horizontally) */
 @media screen and (max-width: 600px) {
-  .topnav.responsive {position: relative;}
-  .topnav.responsive a.icon {
+  .myTopNav.responsive {position: relative;}
+  .myTopNav.responsive a.icon {
     position: absolute;
     right: 0;
     top: 0;
   }
-  .topnav.responsive a {
+  .myTopNav.responsive a {
     float: none;
     display: block;
     text-align: left;
   }
-  .topnav.responsive .dropdown {float: none;}
-  .topnav.responsive .dropdown-content {position: relative;}
-  .topnav.responsive .dropdown .dropbtn {
+  .myTopNav.responsive .dropdown {float: none;}
+  .myTopNav.responsive .dropdown-content {position: relative;}
+  .myTopNav.responsive .dropdown .dropbtn {
     display: block;
     width: 100%;
     text-align: left;
@@ -198,4 +217,15 @@
     margin-bottom: 0; 
 }
 
+.myfooter {
+  overflow: auto;
+  display: flex;
+  flex-direction: row;
+}
 
+.myfooter div {
+  height: 32px;
+}
+
+.logotext {
+  padding-top: 4px;
diff --git a/themes/pypy/templates/base_header.tmpl b/themes/pypy/templates/base_header.tmpl
--- a/themes/pypy/templates/base_header.tmpl
+++ b/themes/pypy/templates/base_header.tmpl
@@ -29,8 +29,13 @@
 {% endmacro %}
 
 {% macro html_navigation_links() %}
-    
    
+    
    
     
    
+      
+        PyPy/
+      
+    
    
+    
    
     {{ html_navigation_links_entries(navigation_links) }}
     {{ html_navigation_links_entries(navigation_alt_links) }}
     {{ template_hooks['menu']() }}

From pypy.commits at gmail.com  Thu Jan  9 08:47:18 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 09 Jan 2020 05:47:18 -0800 (PST)
Subject: [pypy-commit] pypy default: fast path for 0 << n
Message-ID: <5e172ee6.1c69fb81.47f34.e973@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98496:5bc85c774501
Date: 2020-01-08 14:29 +0100
http://bitbucket.org/pypy/pypy/changeset/5bc85c774501/

Log:	fast path for 0 << n

diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py
--- a/rpython/rlib/rbigint.py
+++ b/rpython/rlib/rbigint.py
@@ -1174,7 +1174,7 @@
     def lshift(self, int_other):
         if int_other < 0:
             raise ValueError("negative shift count")
-        elif int_other == 0:
+        elif int_other == 0 or self.sign == 0:
             return self
 
         # wordshift, remshift = divmod(int_other, SHIFT)
@@ -1183,8 +1183,6 @@
 
         if not remshift:
             # So we can avoid problems with eq, AND avoid the need for normalize.
-            if self.sign == 0:
-                return self
             return rbigint([NULLDIGIT] * wordshift + self._digits, self.sign, self.numdigits() + wordshift)
 
         oldsize = self.numdigits()
diff --git a/rpython/rlib/test/test_rbigint.py b/rpython/rlib/test/test_rbigint.py
--- a/rpython/rlib/test/test_rbigint.py
+++ b/rpython/rlib/test/test_rbigint.py
@@ -704,6 +704,10 @@
         # Chek value accuracy.
         assert rbigint.fromlong(18446744073709551615L).rshift(1).tolong() == 18446744073709551615L >> 1
 
+    def test_shift_optimization(self):
+        # does not crash with memory error
+        assert rbigint.fromint(0).lshift(sys.maxint).tolong() == 0
+
     def test_qshift(self):
         for x in range(10):
             for y in range(1, 161, 16):

From pypy.commits at gmail.com  Thu Jan  9 08:47:20 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 09 Jan 2020 05:47:20 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: essential fast path: 0 << gigantic number
 == 0
Message-ID: <5e172ee8.1c69fb81.a2697.838e@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98497:c7e6320ee915
Date: 2020-01-08 14:34 +0100
http://bitbucket.org/pypy/pypy/changeset/c7e6320ee915/

Log:	essential fast path: 0 << gigantic number == 0

diff --git a/pypy/objspace/std/longobject.py b/pypy/objspace/std/longobject.py
--- a/pypy/objspace/std/longobject.py
+++ b/pypy/objspace/std/longobject.py
@@ -308,6 +308,8 @@
         try:
             shift = w_other.asbigint().toint()
         except OverflowError:   # b too big
+            if self.num.sign == 0:
+                return self
             raise oefmt(space.w_OverflowError, "shift count too large")
         return W_LongObject(self.num.lshift(shift))
 
diff --git a/pypy/objspace/std/test/test_longobject.py b/pypy/objspace/std/test/test_longobject.py
--- a/pypy/objspace/std/test/test_longobject.py
+++ b/pypy/objspace/std/test/test_longobject.py
@@ -213,6 +213,7 @@
         raises(ValueError, "long(1) >> long(-1)")
         raises(ValueError, "long(1) >> -1")
         raises(OverflowError, "long(1) >> (2 ** 100)")
+        assert 0 << (1 << 1000) == 0
 
     def test_pow(self):
         long = self._long

From pypy.commits at gmail.com  Thu Jan  9 08:47:22 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 09 Jan 2020 05:47:22 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: missing gc collect
Message-ID: <5e172eea.1c69fb81.c2713.981f@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98498:c0adca7f067e
Date: 2020-01-08 14:48 +0100
http://bitbucket.org/pypy/pypy/changeset/c0adca7f067e/

Log:	missing gc collect

diff --git a/lib-python/3/test/test_queue.py b/lib-python/3/test/test_queue.py
--- a/lib-python/3/test/test_queue.py
+++ b/lib-python/3/test/test_queue.py
@@ -539,6 +539,7 @@
             q.put(C())
         for i in range(N):
             wr = weakref.ref(q.get())
+            support.gc_collect()
             self.assertIsNone(wr())
 
 

From pypy.commits at gmail.com  Thu Jan  9 08:47:24 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 09 Jan 2020 05:47:24 -0800 (PST)
Subject: [pypy-commit] pypy default: test and fix for #3146
Message-ID: <5e172eec.1c69fb81.14e6.01d8@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98499:9e44a2dcc537
Date: 2020-01-09 14:45 +0100
http://bitbucket.org/pypy/pypy/changeset/9e44a2dcc537/

Log:	test and fix for #3146

	JsonDictStrategy was missing a setitem_str default implementation,
	so all strategies that were missing it would crash when using as a
	__dict__ of an instance.

	the JsonDictStrategy problem only occurs on PyPy3 because json dicts
	have unicode keys, but this is still the correct change for other
	dict strategies that don't want to define their own setitem_str even
	on PyPy2

diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -524,6 +524,10 @@
     def get_empty_storage(self):
         raise NotImplementedError
 
+    def setitem_str(self, w_dict, key, w_value):
+        w_dict.setitem(self.space.newtext(key), w_value)
+
+
     @jit.look_inside_iff(lambda self, w_dict:
                          w_dict_unrolling_heuristic(w_dict))
     def w_keys(self, w_dict):
diff --git a/pypy/objspace/std/jsondict.py b/pypy/objspace/std/jsondict.py
--- a/pypy/objspace/std/jsondict.py
+++ b/pypy/objspace/std/jsondict.py
@@ -89,6 +89,10 @@
         self.switch_to_unicode_strategy(w_dict)
         w_dict.setitem(w_key, w_value)
 
+    # for setitem_str use the default implementation
+    # because the jsonmap needs a wrapped key anyway
+
+
     def setdefault(self, w_dict, w_key, w_default):
         if self.is_correct_type(w_key):
             w_result = self.getitem_unicode(w_dict, w_key)
diff --git a/pypy/objspace/std/test/test_jsondict.py b/pypy/objspace/std/test/test_jsondict.py
--- a/pypy/objspace/std/test/test_jsondict.py
+++ b/pypy/objspace/std/test/test_jsondict.py
@@ -111,3 +111,16 @@
         str(d)
         repr(d)
 
+    def test_objdict_bug(self):
+        import _pypyjson
+        a = """{"foo": "bar"}"""
+        d = _pypyjson.loads(a)
+        d['foo'] = 'x'
+
+        class Obj(object):
+            pass
+
+        x = Obj()
+        x.__dict__ = d
+
+        x.foo = 'baz'  # used to segfault on pypy3

From pypy.commits at gmail.com  Thu Jan  9 08:47:25 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 09 Jan 2020 05:47:25 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: mergedefault
Message-ID: <5e172eed.1c69fb81.1b421.76c7@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98500:e89bb6f7069c
Date: 2020-01-09 14:46 +0100
http://bitbucket.org/pypy/pypy/changeset/e89bb6f7069c/

Log:	mergedefault

diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -448,6 +448,10 @@
     def get_empty_storage(self):
         raise NotImplementedError
 
+    def setitem_str(self, w_dict, key, w_value):
+        w_dict.setitem(self.space.newtext(key), w_value)
+
+
     @jit.look_inside_iff(lambda self, w_dict:
                          w_dict_unrolling_heuristic(w_dict))
     def w_keys(self, w_dict):
diff --git a/pypy/objspace/std/jsondict.py b/pypy/objspace/std/jsondict.py
--- a/pypy/objspace/std/jsondict.py
+++ b/pypy/objspace/std/jsondict.py
@@ -89,6 +89,10 @@
         self.switch_to_unicode_strategy(w_dict)
         w_dict.setitem(w_key, w_value)
 
+    # for setitem_str use the default implementation
+    # because the jsonmap needs a wrapped key anyway
+
+
     def setdefault(self, w_dict, w_key, w_default):
         if self.is_correct_type(w_key):
             w_result = self.getitem_unicode(w_dict, w_key)
diff --git a/pypy/objspace/std/test/test_jsondict.py b/pypy/objspace/std/test/test_jsondict.py
--- a/pypy/objspace/std/test/test_jsondict.py
+++ b/pypy/objspace/std/test/test_jsondict.py
@@ -103,3 +103,16 @@
         str(d)
         repr(d)
 
+    def test_objdict_bug(self):
+        import _pypyjson
+        a = """{"foo": "bar"}"""
+        d = _pypyjson.loads(a)
+        d['foo'] = 'x'
+
+        class Obj(object):
+            pass
+
+        x = Obj()
+        x.__dict__ = d
+
+        x.foo = 'baz'  # used to segfault on pypy3
diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py
--- a/rpython/rlib/rbigint.py
+++ b/rpython/rlib/rbigint.py
@@ -1174,7 +1174,7 @@
     def lshift(self, int_other):
         if int_other < 0:
             raise ValueError("negative shift count")
-        elif int_other == 0:
+        elif int_other == 0 or self.sign == 0:
             return self
 
         # wordshift, remshift = divmod(int_other, SHIFT)
@@ -1183,8 +1183,6 @@
 
         if not remshift:
             # So we can avoid problems with eq, AND avoid the need for normalize.
-            if self.sign == 0:
-                return self
             return rbigint([NULLDIGIT] * wordshift + self._digits, self.sign, self.numdigits() + wordshift)
 
         oldsize = self.numdigits()
diff --git a/rpython/rlib/test/test_rbigint.py b/rpython/rlib/test/test_rbigint.py
--- a/rpython/rlib/test/test_rbigint.py
+++ b/rpython/rlib/test/test_rbigint.py
@@ -704,6 +704,10 @@
         # Chek value accuracy.
         assert rbigint.fromlong(18446744073709551615L).rshift(1).tolong() == 18446744073709551615L >> 1
 
+    def test_shift_optimization(self):
+        # does not crash with memory error
+        assert rbigint.fromint(0).lshift(sys.maxint).tolong() == 0
+
     def test_qshift(self):
         for x in range(10):
             for y in range(1, 161, 16):

From pypy.commits at gmail.com  Thu Jan  9 10:01:51 2020
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 09 Jan 2020 07:01:51 -0800 (PST)
Subject: [pypy-commit] pypy default: Partially resync pyport.h with
 CPython2.7 and add missing constants PY_INT32_T, etc.
Message-ID: <5e17405f.1c69fb81.3a50c.1034@mx.google.com>

Author: Ronan Lamy 
Branch: 
Changeset: r98501:11fe1f50f3f8
Date: 2020-01-09 14:59 +0000
http://bitbucket.org/pypy/pypy/changeset/11fe1f50f3f8/

Log:	Partially resync pyport.h with CPython2.7 and add missing constants
	PY_INT32_T, etc.

diff --git a/pypy/module/cpyext/include/pyport.h b/pypy/module/cpyext/include/pyport.h
--- a/pypy/module/cpyext/include/pyport.h
+++ b/pypy/module/cpyext/include/pyport.h
@@ -28,10 +28,86 @@
 #endif
 #endif /* HAVE_LONG_LONG */
 
+/* a build with 30-bit digits for Python long 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
+ * long 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
+
+/* uintptr_t is the C9X name for an unsigned integral type such that a
+ * legitimate void* can be cast to uintptr_t and then back to void* again
+ * 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 */
+
 /* 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 
+   definition for C89, due to the way signed->unsigned
    conversion is defined. */
 #ifdef SIZE_MAX
 #define PY_SIZE_MAX SIZE_MAX
@@ -39,35 +115,9 @@
 #define PY_SIZE_MAX ((size_t)-1)
 #endif
 
-/* CPython needs this for the c-extension datetime, which is pure python on PyPy 
+/* CPython needs this for the c-extension datetime, which is pure python on PyPy
    downstream packages assume it is here (Pandas for instance) */
-#include  
-
-/* uintptr_t is the C9X name for an unsigned integral type such that a
- * legitimate void* can be cast to uintptr_t and then back to void* again
- * 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 */
-
+#include 
 
 /*******************************
  * stat() and fstat() fiddling *
@@ -130,6 +180,13 @@
 #define Py_ALIGNED(x)
 #endif
 
+/* Eliminate end-of-loop code not reached warnings from SunPro C
+ * when using do{...}while(0) macros
+ */
+#ifdef __SUNPRO_C
+#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.
diff --git a/pypy/module/cpyext/parse/cpyext_object.h b/pypy/module/cpyext/parse/cpyext_object.h
--- a/pypy/module/cpyext/parse/cpyext_object.h
+++ b/pypy/module/cpyext/parse/cpyext_object.h
@@ -1,6 +1,6 @@
 #pragma once
 
-typedef long Py_ssize_t;
+typedef long Py_ssize_t;  /* CPython defines it in pyport.h */
 
 #define PyObject_HEAD  \
     Py_ssize_t ob_refcnt;        \

From pypy.commits at gmail.com  Thu Jan  9 15:21:09 2020
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 09 Jan 2020 12:21:09 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: Partially resync pyport.h with CPython 3.6
Message-ID: <5e178b35.1c69fb81.60db6.f22a@mx.google.com>

Author: Ronan Lamy 
Branch: py3.6
Changeset: r98503:1b19e41a3920
Date: 2020-01-09 20:16 +0000
http://bitbucket.org/pypy/pypy/changeset/1b19e41a3920/

Log:	Partially resync pyport.h with CPython 3.6

diff --git a/pypy/module/cpyext/include/pyport.h b/pypy/module/cpyext/include/pyport.h
--- a/pypy/module/cpyext/include/pyport.h
+++ b/pypy/module/cpyext/include/pyport.h
@@ -5,115 +5,34 @@
 #include 
 #endif
 
-/* typedefs for some C9X-defined synonyms for integral types. */
-#ifdef HAVE_LONG_LONG
+/* long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG 1
+#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. */
-#define PY_LLONG_MAX __LONG_LONG_MAX__
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL)
-#else
-/* Otherwise, rely on two's complement. */
-#define PY_ULLONG_MAX (~0ULL)
-#define PY_LLONG_MAX  ((long long)(PY_ULLONG_MAX>>1))
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#endif /* LLONG_MAX */
-#endif
-#endif /* HAVE_LONG_LONG */
-
-/* a build with 30-bit digits for Python long 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
- * long 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
+#define PY_INT32_T int32_t
+#define PY_INT64_T int64_t
 
-#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
 
 /* uintptr_t is the C9X name for an unsigned integral type such that a
  * legitimate void* can be cast to uintptr_t and then back to void* again
  * 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 */
-
-/* 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
-#define PY_SIZE_MAX SIZE_MAX
-#else
-#define PY_SIZE_MAX ((size_t)-1)
-#endif
 
 /* Py_hash_t is the same size as a pointer. */
 #define SIZEOF_PY_HASH_T SIZEOF_SIZE_T
@@ -122,18 +41,16 @@
 #define SIZEOF_PY_UHASH_T SIZEOF_SIZE_T
 typedef size_t Py_uhash_t;
 
+/* Largest possible value of size_t. */
+#define PY_SIZE_MAX SIZE_MAX
+
+/* Largest positive value of type Py_ssize_t. */
+#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
+/* Smallest negative value of type Py_ssize_t. */
+#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
+
 #include 
 
-#ifdef __va_copy
-#define Py_VA_COPY __va_copy
-#else
-#ifdef VA_LIST_IS_ARRAY
-#define Py_VA_COPY(x, y) Py_MEMCPY((x), (y), sizeof(va_list))
-#else
-#define Py_VA_COPY(x, y) (x) = (y)
-#endif
-#endif
-
 /* CPython needs this for the c-extension datetime, which is pure python on PyPy
    downstream packages assume it is here (Pandas for instance) */
 #include 
@@ -183,8 +100,7 @@
  * Hide GCC attributes from compilers that don't support them.
  */
 #if (!defined(__GNUC__) || __GNUC__ < 2 || \
-     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) && \
-    !defined(RISCOS)
+     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) )
 #define Py_GCC_ATTRIBUTE(x)
 #else
 #define Py_GCC_ATTRIBUTE(x) __attribute__(x)
@@ -206,10 +122,6 @@
 #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
@@ -218,4 +130,7 @@
 #define Py_ULL(x) Py_LL(x##U)
 #endif
 
+#define Py_VA_COPY va_copy
+
+
 #endif /* Py_PYPORT_H */

From pypy.commits at gmail.com  Thu Jan  9 21:45:58 2020
From: pypy.commits at gmail.com (mattip)
Date: Thu, 09 Jan 2020 18:45:58 -0800 (PST)
Subject: [pypy-commit] pypy default: issue 3144: version was not being
 updated, and was the wrong thing to check anyway
Message-ID: <5e17e566.1c69fb81.7d062.1ed3@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r98504:580ac8d8c1af
Date: 2020-01-10 10:44 +0800
http://bitbucket.org/pypy/pypy/changeset/580ac8d8c1af/

Log:	issue 3144: version was not being updated, and was the wrong thing
	to check anyway

diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py
--- a/lib_pypy/_curses_build.py
+++ b/lib_pypy/_curses_build.py
@@ -6,9 +6,7 @@
     static const int NCURSES_VERSION_MINOR;
 '''
 
-version = (0, 0)
 def find_library(options):
-    global version
     for library in options:
         ffi = FFI()
         ffi.cdef(version_str)
@@ -17,7 +15,6 @@
             ffi.compile()
             import _curses_cffi_check
             lib = _curses_cffi_check.lib
-            version = (lib.NCURSES_VERSION_MAJOR, lib.NCURSES_VERSION_MINOR)
         except VerificationError as e:
             e_last = e
             continue
@@ -41,6 +38,7 @@
     include_dirs = [os.path.join(base, 'include', name)]
     library_dirs = [os.path.join(base, 'lib')]
     libs = [name, name.replace('ncurses', 'panel')]
+    print('found base', base, name, libs)
 else:
     include_dirs = []
     library_dirs = []
@@ -385,7 +383,7 @@
 void _m_getsyx(int *yx);
 """)
 
-if version > (5, 7):
+if 'ncursesw' in libs:
     ffi.cdef("""
 typedef int... wint_t;
 int wget_wch(WINDOW *, wint_t *);

From pypy.commits at gmail.com  Fri Jan 10 04:26:19 2020
From: pypy.commits at gmail.com (arigo)
Date: Fri, 10 Jan 2020 01:26:19 -0800 (PST)
Subject: [pypy-commit] pypy default: update to cffi/d6ad2ea5a57e
Message-ID: <5e18433b.1c69fb81.636a8.6ffa@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98506:6ffda521295e
Date: 2020-01-10 10:25 +0100
http://bitbucket.org/pypy/pypy/changeset/6ffda521295e/

Log:	update to cffi/d6ad2ea5a57e

diff --git a/extra_tests/cffi_tests/cffi0/backend_tests.py b/extra_tests/cffi_tests/cffi0/backend_tests.py
--- a/extra_tests/cffi_tests/cffi0/backend_tests.py
+++ b/extra_tests/cffi_tests/cffi0/backend_tests.py
@@ -1242,7 +1242,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1261,7 +1261,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi0/test_zdistutils.py b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
--- a/extra_tests/cffi_tests/cffi0/test_zdistutils.py
+++ b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
@@ -90,7 +90,7 @@
         csrc = '/*hi there %s!2*/\n#include \n' % self
         v = Verifier(ffi, csrc, force_generic_engine=self.generic,
                      libraries=[self.lib_m])
-        basename = self.__class__.__name__ + 'test_compile_module'
+        basename = self.__class__.__name__[:10] + '_test_compile_module'
         v.modulefilename = filename = str(udir.join(basename + '.so'))
         v.compile_module()
         assert filename == v.modulefilename
diff --git a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
--- a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
+++ b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
@@ -1221,7 +1221,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1239,7 +1239,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi1/test_recompiler.py b/extra_tests/cffi_tests/cffi1/test_recompiler.py
--- a/extra_tests/cffi_tests/cffi1/test_recompiler.py
+++ b/extra_tests/cffi_tests/cffi1/test_recompiler.py
@@ -27,13 +27,14 @@
 
 def verify(ffi, module_name, source, *args, **kwds):
     no_cpp = kwds.pop('no_cpp', False)
+    ignore_warnings = kwds.pop('ignore_warnings', False)
     kwds.setdefault('undef_macros', ['NDEBUG'])
     module_name = '_CFFI_' + module_name
     ffi.set_source(module_name, source)
     if not os.environ.get('NO_CPP') and not no_cpp:   # test the .cpp mode too
         kwds.setdefault('source_extension', '.cpp')
         source = 'extern "C" {\n%s\n}' % (source,)
-    elif sys.platform != 'win32':
+    elif sys.platform != 'win32' and not ignore_warnings:
         # add '-Werror' to the existing 'extra_compile_args' flags
         from extra_tests.cffi_tests.support import extra_compile_args
         kwds['extra_compile_args'] = (kwds.get('extra_compile_args', []) +
@@ -137,7 +138,8 @@
     import math
     ffi = FFI()
     ffi.cdef("float sin(double); double cos(double);")
-    lib = verify(ffi, 'test_math_sin', '#include ')
+    lib = verify(ffi, 'test_math_sin', '#include ',
+                 ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_repr_lib():
@@ -646,7 +648,7 @@
     ffi.cdef("sshort_t ff3(sshort_t);")
     lib = verify(ffi, "test_include_3",
                  "typedef short sshort_t; //usually from a #include\n"
-                 "sshort_t ff3(sshort_t x) { return x + 42; }")
+                 "sshort_t ff3(sshort_t x) { return (sshort_t)(x + 42); }")
     assert lib.ff3(10) == 52
     assert ffi.typeof(ffi.cast("sshort_t", 42)) is ffi.typeof("short")
     assert ffi1.typeof("sshort_t") is ffi.typeof("sshort_t")
@@ -755,7 +757,7 @@
     ffi = FFI()
     ffi.cdef(unicode("float sin(double); double cos(double);"))
     lib = verify(ffi, 'test_math_sin_unicode', unicode('#include '),
-                 libraries=[unicode(lib_m)])
+                 libraries=[unicode(lib_m)], ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_incomplete_struct_as_arg():
@@ -883,15 +885,20 @@
     e5 = py.test.raises(TypeError, lib.foo2)
     e6 = py.test.raises(TypeError, lib.foo2, 42)
     e7 = py.test.raises(TypeError, lib.foo2, 45, 46, 47)
-    assert str(e1.value) == "foo0() takes no arguments (1 given)"
-    assert str(e2.value) == "foo0() takes no arguments (2 given)"
-    assert str(e3.value) == "foo1() takes exactly one argument (0 given)"
-    assert str(e4.value) == "foo1() takes exactly one argument (2 given)"
-    assert str(e5.value) in ["foo2 expected 2 arguments, got 0",
+    def st1(s):
+        s = str(s)
+        if s.startswith("_CFFI_test_unpack_args.CompiledLib."):
+            s = s[len("_CFFI_test_unpack_args.CompiledLib."):]
+        return s
+    assert st1(e1.value) == "foo0() takes no arguments (1 given)"
+    assert st1(e2.value) == "foo0() takes no arguments (2 given)"
+    assert st1(e3.value) == "foo1() takes exactly one argument (0 given)"
+    assert st1(e4.value) == "foo1() takes exactly one argument (2 given)"
+    assert st1(e5.value) in ["foo2 expected 2 arguments, got 0",
                              "foo2() takes exactly 2 arguments (0 given)"]
-    assert str(e6.value) in ["foo2 expected 2 arguments, got 1",
+    assert st1(e6.value) in ["foo2 expected 2 arguments, got 1",
                              "foo2() takes exactly 2 arguments (1 given)"]
-    assert str(e7.value) in ["foo2 expected 2 arguments, got 3",
+    assert st1(e7.value) in ["foo2 expected 2 arguments, got 3",
                              "foo2() takes exactly 2 arguments (3 given)"]
 
 def test_address_of_function():
@@ -899,7 +906,7 @@
     ffi.cdef("long myfunc(long x);")
     lib = verify(ffi, "test_addressof_function", """
         char myfunc(char x) { return (char)(x + 42); }
-    """)
+    """, ignore_warnings=True)
     assert lib.myfunc(5) == 47
     assert lib.myfunc(0xABC05) == 47
     assert not isinstance(lib.myfunc, ffi.CData)
@@ -1172,7 +1179,7 @@
     lib = verify(ffi, 'test_some_float_invalid_3', """
         typedef long double foo_t;
         foo_t neg(foo_t x) { return -x; }
-    """)
+    """, ignore_warnings=True)
     if ffi.sizeof("long double") == ffi.sizeof("double"):
         assert lib.neg(12.3) == -12.3
     else:
@@ -1846,7 +1853,7 @@
     ffi = FFI()
     ffi.cdef("float f1(double);")
     lib = verify(ffi, 'test_introspect_function', """
-        float f1(double x) { return x; }
+        float f1(double x) { return (float)x; }
     """)
     assert dir(lib) == ['f1']
     FUNC = ffi.typeof(lib.f1)
@@ -2151,7 +2158,8 @@
     lib = verify(ffi, "test_call_with_nested_anonymous_struct", """
         struct foo { int a; union { int b, c; }; };
         struct foo f(void) {
-            struct foo s = { 40 };
+            struct foo s;
+            s.a = 40;
             s.b = 200;
             return s;
         }
diff --git a/extra_tests/cffi_tests/support.py b/extra_tests/cffi_tests/support.py
--- a/extra_tests/cffi_tests/support.py
+++ b/extra_tests/cffi_tests/support.py
@@ -2,7 +2,7 @@
 import sys, os
 
 if sys.version_info < (3,):
-    __all__ = ['u']
+    __all__ = ['u', 'arraytostring']
 
     class U(object):
         def __add__(self, other):
@@ -13,12 +13,16 @@
     assert u+'a\x00b' == eval(r"u'a\x00b'")
     assert u+'a\u1234b' == eval(r"u'a\u1234b'")
     assert u+'a\U00012345b' == eval(r"u'a\U00012345b'")
+    def arraytostring(a):
+        return a.tostring()
 
 else:
-    __all__ = ['u', 'unicode', 'long']
+    __all__ = ['u', 'unicode', 'long', 'arraytostring']
     u = ""
     unicode = str
     long = int
+    def arraytostring(a):
+        return a.tobytes()
 
 
 class StdErrCapture(object):
diff --git a/lib_pypy/cffi/recompiler.py b/lib_pypy/cffi/recompiler.py
--- a/lib_pypy/cffi/recompiler.py
+++ b/lib_pypy/cffi/recompiler.py
@@ -1216,7 +1216,8 @@
             size_of_result = '(int)sizeof(%s)' % (
                 tp.result.get_c_name('', context),)
         prnt('static struct _cffi_externpy_s _cffi_externpy__%s =' % name)
-        prnt('  { "%s.%s", %s };' % (self.module_name, name, size_of_result))
+        prnt('  { "%s.%s", %s, 0, 0 };' % (
+            self.module_name, name, size_of_result))
         prnt()
         #
         arguments = []

From pypy.commits at gmail.com  Fri Jan 10 07:00:18 2020
From: pypy.commits at gmail.com (arigo)
Date: Fri, 10 Jan 2020 04:00:18 -0800 (PST)
Subject: [pypy-commit] pypy default: Issue #3149
Message-ID: <5e186752.1c69fb81.9d7c0.9122@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98507:11a00b95fd59
Date: 2020-01-10 12:59 +0100
http://bitbucket.org/pypy/pypy/changeset/11a00b95fd59/

Log:	Issue #3149

	Fix the exception-matching logic to fall back to the general
	issubclass() logic. This is what CPython 2.x does.

diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -219,13 +219,15 @@
     return BaseObjSpace.exception_getclass(space, w_obj)
 
 def exception_issubclass_w(space, w_cls1, w_cls2):
-    if isinstance(w_cls1, W_ClassObject):
-        if isinstance(w_cls2, W_ClassObject):
-            return w_cls1.is_subclass_of(w_cls2)
-        return False
-    if isinstance(w_cls2, W_ClassObject):
-        return False
-    return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
+    if (space.type(w_cls1) is space.w_type and
+        space.type(w_cls2) is space.w_type):
+        return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
+    #
+    # The rest is the rare slow case.  Use the general logic of issubclass()
+    # (issue #3149).  CPython 3.x doesn't do that, but there is a many-years
+    # issue report: https://bugs.python.org/issue12029.  In PyPy3 we try to
+    # fix the issue with the same code, as long as no CPython3 test fails.
+    return abstract_issubclass_w(space, w_cls1, w_cls2, True)
 
 # ____________________________________________________________
 # App-level interface
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -239,3 +239,23 @@
                 return False
 
         assert issubclass(42, M()) is False
+
+    def test_exception_match_calls_subclasscheck(self):
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            raise ValueError
+        except Special:
+            pass
+
+    def test_exception_raising_calls_subclasscheck(self):
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            raise Special, ValueError()
+        except ValueError:
+            pass

From pypy.commits at gmail.com  Fri Jan 10 07:11:57 2020
From: pypy.commits at gmail.com (arigo)
Date: Fri, 10 Jan 2020 04:11:57 -0800 (PST)
Subject: [pypy-commit] pypy default: Follow-up for 11a00b95fd59: fix
 regression shown in interpreter/test/test_raises
Message-ID: <5e186a0d.1c69fb81.effd6.9014@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98508:af773c2ddf27
Date: 2020-01-10 13:11 +0100
http://bitbucket.org/pypy/pypy/changeset/af773c2ddf27/

Log:	Follow-up for 11a00b95fd59: fix regression shown in
	interpreter/test/test_raises

diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -223,6 +223,10 @@
         space.type(w_cls2) is space.w_type):
         return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
     #
+    if (not exception_is_valid_class_w(space, w_cls2) or
+        not exception_is_valid_class_w(space, w_cls1)):
+        return False
+    #
     # The rest is the rare slow case.  Use the general logic of issubclass()
     # (issue #3149).  CPython 3.x doesn't do that, but there is a many-years
     # issue report: https://bugs.python.org/issue12029.  In PyPy3 we try to

From pypy.commits at gmail.com  Fri Jan 10 07:28:55 2020
From: pypy.commits at gmail.com (arigo)
Date: Fri, 10 Jan 2020 04:28:55 -0800 (PST)
Subject: [pypy-commit] pypy default: Fix comment after looking more in the
 CPython 3.x situation
Message-ID: <5e186e07.1c69fb81.42cff.92bc@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98509:038f81a04a45
Date: 2020-01-10 13:16 +0100
http://bitbucket.org/pypy/pypy/changeset/038f81a04a45/

Log:	Fix comment after looking more in the CPython 3.x situation

diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -228,9 +228,10 @@
         return False
     #
     # The rest is the rare slow case.  Use the general logic of issubclass()
-    # (issue #3149).  CPython 3.x doesn't do that, but there is a many-years
-    # issue report: https://bugs.python.org/issue12029.  In PyPy3 we try to
-    # fix the issue with the same code, as long as no CPython3 test fails.
+    # (issue #3149).  CPython 3.x doesn't do that (but there is a
+    # many-years issue report: https://bugs.python.org/issue12029), and
+    # there are probably tests, so we won't call abstract_issubclass_w()
+    # either in PyPy3.
     return abstract_issubclass_w(space, w_cls1, w_cls2, True)
 
 # ____________________________________________________________

From pypy.commits at gmail.com  Fri Jan 10 07:28:57 2020
From: pypy.commits at gmail.com (arigo)
Date: Fri, 10 Jan 2020 04:28:57 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: hg merge default
Message-ID: <5e186e09.1c69fb81.fbc79.9545@mx.google.com>

Author: Armin Rigo 
Branch: py3.6
Changeset: r98510:bff2944c1684
Date: 2020-01-10 13:28 +0100
http://bitbucket.org/pypy/pypy/changeset/bff2944c1684/

Log:	hg merge default

diff --git a/extra_tests/cffi_tests/cffi0/backend_tests.py b/extra_tests/cffi_tests/cffi0/backend_tests.py
--- a/extra_tests/cffi_tests/cffi0/backend_tests.py
+++ b/extra_tests/cffi_tests/cffi0/backend_tests.py
@@ -1242,7 +1242,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1261,7 +1261,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi0/test_zdistutils.py b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
--- a/extra_tests/cffi_tests/cffi0/test_zdistutils.py
+++ b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
@@ -90,7 +90,7 @@
         csrc = '/*hi there %s!2*/\n#include \n' % self
         v = Verifier(ffi, csrc, force_generic_engine=self.generic,
                      libraries=[self.lib_m])
-        basename = self.__class__.__name__ + 'test_compile_module'
+        basename = self.__class__.__name__[:10] + '_test_compile_module'
         v.modulefilename = filename = str(udir.join(basename + '.so'))
         v.compile_module()
         assert filename == v.modulefilename
diff --git a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
--- a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
+++ b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
@@ -1221,7 +1221,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1239,7 +1239,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi1/test_recompiler.py b/extra_tests/cffi_tests/cffi1/test_recompiler.py
--- a/extra_tests/cffi_tests/cffi1/test_recompiler.py
+++ b/extra_tests/cffi_tests/cffi1/test_recompiler.py
@@ -27,13 +27,14 @@
 
 def verify(ffi, module_name, source, *args, **kwds):
     no_cpp = kwds.pop('no_cpp', False)
+    ignore_warnings = kwds.pop('ignore_warnings', False)
     kwds.setdefault('undef_macros', ['NDEBUG'])
     module_name = '_CFFI_' + module_name
     ffi.set_source(module_name, source)
     if not os.environ.get('NO_CPP') and not no_cpp:   # test the .cpp mode too
         kwds.setdefault('source_extension', '.cpp')
         source = 'extern "C" {\n%s\n}' % (source,)
-    elif sys.platform != 'win32':
+    elif sys.platform != 'win32' and not ignore_warnings:
         # add '-Werror' to the existing 'extra_compile_args' flags
         from extra_tests.cffi_tests.support import extra_compile_args
         kwds['extra_compile_args'] = (kwds.get('extra_compile_args', []) +
@@ -137,7 +138,8 @@
     import math
     ffi = FFI()
     ffi.cdef("float sin(double); double cos(double);")
-    lib = verify(ffi, 'test_math_sin', '#include ')
+    lib = verify(ffi, 'test_math_sin', '#include ',
+                 ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_repr_lib():
@@ -646,7 +648,7 @@
     ffi.cdef("sshort_t ff3(sshort_t);")
     lib = verify(ffi, "test_include_3",
                  "typedef short sshort_t; //usually from a #include\n"
-                 "sshort_t ff3(sshort_t x) { return x + 42; }")
+                 "sshort_t ff3(sshort_t x) { return (sshort_t)(x + 42); }")
     assert lib.ff3(10) == 52
     assert ffi.typeof(ffi.cast("sshort_t", 42)) is ffi.typeof("short")
     assert ffi1.typeof("sshort_t") is ffi.typeof("sshort_t")
@@ -755,7 +757,7 @@
     ffi = FFI()
     ffi.cdef(unicode("float sin(double); double cos(double);"))
     lib = verify(ffi, 'test_math_sin_unicode', unicode('#include '),
-                 libraries=[unicode(lib_m)])
+                 libraries=[unicode(lib_m)], ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_incomplete_struct_as_arg():
@@ -883,15 +885,20 @@
     e5 = py.test.raises(TypeError, lib.foo2)
     e6 = py.test.raises(TypeError, lib.foo2, 42)
     e7 = py.test.raises(TypeError, lib.foo2, 45, 46, 47)
-    assert str(e1.value) == "foo0() takes no arguments (1 given)"
-    assert str(e2.value) == "foo0() takes no arguments (2 given)"
-    assert str(e3.value) == "foo1() takes exactly one argument (0 given)"
-    assert str(e4.value) == "foo1() takes exactly one argument (2 given)"
-    assert str(e5.value) in ["foo2 expected 2 arguments, got 0",
+    def st1(s):
+        s = str(s)
+        if s.startswith("_CFFI_test_unpack_args.CompiledLib."):
+            s = s[len("_CFFI_test_unpack_args.CompiledLib."):]
+        return s
+    assert st1(e1.value) == "foo0() takes no arguments (1 given)"
+    assert st1(e2.value) == "foo0() takes no arguments (2 given)"
+    assert st1(e3.value) == "foo1() takes exactly one argument (0 given)"
+    assert st1(e4.value) == "foo1() takes exactly one argument (2 given)"
+    assert st1(e5.value) in ["foo2 expected 2 arguments, got 0",
                              "foo2() takes exactly 2 arguments (0 given)"]
-    assert str(e6.value) in ["foo2 expected 2 arguments, got 1",
+    assert st1(e6.value) in ["foo2 expected 2 arguments, got 1",
                              "foo2() takes exactly 2 arguments (1 given)"]
-    assert str(e7.value) in ["foo2 expected 2 arguments, got 3",
+    assert st1(e7.value) in ["foo2 expected 2 arguments, got 3",
                              "foo2() takes exactly 2 arguments (3 given)"]
 
 def test_address_of_function():
@@ -899,7 +906,7 @@
     ffi.cdef("long myfunc(long x);")
     lib = verify(ffi, "test_addressof_function", """
         char myfunc(char x) { return (char)(x + 42); }
-    """)
+    """, ignore_warnings=True)
     assert lib.myfunc(5) == 47
     assert lib.myfunc(0xABC05) == 47
     assert not isinstance(lib.myfunc, ffi.CData)
@@ -1172,7 +1179,7 @@
     lib = verify(ffi, 'test_some_float_invalid_3', """
         typedef long double foo_t;
         foo_t neg(foo_t x) { return -x; }
-    """)
+    """, ignore_warnings=True)
     if ffi.sizeof("long double") == ffi.sizeof("double"):
         assert lib.neg(12.3) == -12.3
     else:
@@ -1846,7 +1853,7 @@
     ffi = FFI()
     ffi.cdef("float f1(double);")
     lib = verify(ffi, 'test_introspect_function', """
-        float f1(double x) { return x; }
+        float f1(double x) { return (float)x; }
     """)
     assert dir(lib) == ['f1']
     FUNC = ffi.typeof(lib.f1)
@@ -2151,7 +2158,8 @@
     lib = verify(ffi, "test_call_with_nested_anonymous_struct", """
         struct foo { int a; union { int b, c; }; };
         struct foo f(void) {
-            struct foo s = { 40 };
+            struct foo s;
+            s.a = 40;
             s.b = 200;
             return s;
         }
diff --git a/extra_tests/cffi_tests/support.py b/extra_tests/cffi_tests/support.py
--- a/extra_tests/cffi_tests/support.py
+++ b/extra_tests/cffi_tests/support.py
@@ -2,7 +2,7 @@
 import sys, os
 
 if sys.version_info < (3,):
-    __all__ = ['u']
+    __all__ = ['u', 'arraytostring']
 
     class U(object):
         def __add__(self, other):
@@ -13,12 +13,16 @@
     assert u+'a\x00b' == eval(r"u'a\x00b'")
     assert u+'a\u1234b' == eval(r"u'a\u1234b'")
     assert u+'a\U00012345b' == eval(r"u'a\U00012345b'")
+    def arraytostring(a):
+        return a.tostring()
 
 else:
-    __all__ = ['u', 'unicode', 'long']
+    __all__ = ['u', 'unicode', 'long', 'arraytostring']
     u = ""
     unicode = str
     long = int
+    def arraytostring(a):
+        return a.tobytes()
 
 
 class StdErrCapture(object):
diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py
--- a/lib_pypy/_curses_build.py
+++ b/lib_pypy/_curses_build.py
@@ -6,9 +6,7 @@
     static const int NCURSES_VERSION_MINOR;
 '''
 
-version = (0, 0)
 def find_library(options):
-    global version
     for library in options:
         ffi = FFI()
         ffi.cdef(version_str)
@@ -17,7 +15,6 @@
             ffi.compile()
             import _curses_cffi_check
             lib = _curses_cffi_check.lib
-            version = (lib.NCURSES_VERSION_MAJOR, lib.NCURSES_VERSION_MINOR)
         except VerificationError as e:
             e_last = e
             continue
@@ -385,7 +382,7 @@
 void _m_getsyx(int *yx);
 """)
 
-if version > (5, 7):
+if 'ncursesw' in libs:
     ffi.cdef("""
 typedef int... wint_t;
 int wget_wch(WINDOW *, wint_t *);
diff --git a/lib_pypy/cffi/recompiler.py b/lib_pypy/cffi/recompiler.py
--- a/lib_pypy/cffi/recompiler.py
+++ b/lib_pypy/cffi/recompiler.py
@@ -1216,7 +1216,8 @@
             size_of_result = '(int)sizeof(%s)' % (
                 tp.result.get_c_name('', context),)
         prnt('static struct _cffi_externpy_s _cffi_externpy__%s =' % name)
-        prnt('  { "%s.%s", %s };' % (self.module_name, name, size_of_result))
+        prnt('  { "%s.%s", %s, 0, 0 };' % (
+            self.module_name, name, size_of_result))
         prnt()
         #
         arguments = []
diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -202,6 +202,19 @@
     return BaseObjSpace.exception_getclass(space, w_obj)
 
 def exception_issubclass_w(space, w_cls1, w_cls2):
+    if (space.type(w_cls1) is space.w_type and
+        space.type(w_cls2) is space.w_type):
+        return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
+    #
+    if (not exception_is_valid_class_w(space, w_cls2) or
+        not exception_is_valid_class_w(space, w_cls1)):
+        return False
+    #
+    # The rest is the rare slow case.  Use the general logic of issubclass()
+    # (issue #3149).  CPython 3.x doesn't do that (but there is a
+    # many-years issue report: https://bugs.python.org/issue12029), and
+    # there are probably tests, so we won't call abstract_issubclass_w()
+    # either in PyPy3.
     return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
 
 # ____________________________________________________________
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -249,3 +249,25 @@
                 return False
 
         assert issubclass(42, M()) is False
+
+    def test_exception_match_does_not_call_subclasscheck(self):
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            raise ValueError
+        except ValueError:       # Python 3.x behaviour
+            pass
+
+    def test_exception_raising_does_not_call_subclasscheck(self):
+        # test skipped: unsure how to get a non-normalized exception
+        # from pure Python.
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            skip("non-normalized exception") #raise Special, ValueError()
+        except Special:
+            pass

From pypy.commits at gmail.com  Fri Jan 10 13:20:31 2020
From: pypy.commits at gmail.com (rlamy)
Date: Fri, 10 Jan 2020 10:20:31 -0800 (PST)
Subject: [pypy-commit] pypy py3.6-sqlite: Close branch py3.6-sqlite
Message-ID: <5e18c06f.1c69fb81.6cc0b.f1f5@mx.google.com>

Author: Ronan Lamy 
Branch: py3.6-sqlite
Changeset: r98517:3f0f60903ac6
Date: 2020-01-10 18:19 +0000
http://bitbucket.org/pypy/pypy/changeset/3f0f60903ac6/

Log:	Close branch py3.6-sqlite


From pypy.commits at gmail.com  Fri Jan 10 13:20:45 2020
From: pypy.commits at gmail.com (rlamy)
Date: Fri, 10 Jan 2020 10:20:45 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: Merged in py3.6-sqlite (pull request #694)
Message-ID: <5e18c07d.1c69fb81.42cff.ea29@mx.google.com>

Author: Ronan Lamy 
Branch: py3.6
Changeset: r98518:928110c124ae
Date: 2020-01-10 18:19 +0000
http://bitbucket.org/pypy/pypy/changeset/928110c124ae/

Log:	Merged in py3.6-sqlite (pull request #694)

	Follow CPython's behaviour more closely in sqlite3

diff --git a/extra_tests/test_sqlite3.py b/extra_tests/test_sqlite3.py
--- a/extra_tests/test_sqlite3.py
+++ b/extra_tests/test_sqlite3.py
@@ -88,8 +88,7 @@
     with pytest.raises(StopIteration):
         next(cur)
 
-    with pytest.raises(_sqlite3.ProgrammingError):
-        cur.executemany('select 1', [])
+    cur.executemany('select 1', [])
     with pytest.raises(StopIteration):
         next(cur)
 
@@ -201,8 +200,8 @@
 
 def test_explicit_begin(con):
     con.execute('BEGIN')
-    con.execute('BEGIN ')
-    con.execute('BEGIN')
+    with pytest.raises(_sqlite3.OperationalError):
+        con.execute('BEGIN ')
     con.commit()
     con.execute('BEGIN')
     con.commit()
@@ -212,7 +211,6 @@
     con.execute('select 1')
 
 def test_returning_blob_must_own_memory(con):
-    import gc
     con.create_function("returnblob", 0, lambda: memoryview(b"blob"))
     cur = con.execute("select returnblob()")
     val = cur.fetchone()[0]
@@ -228,15 +226,15 @@
     cur = con.cursor()
     cur.execute("create table test(a)")
     cur.executemany("insert into test values (?)", [[1], [2], [3]])
-    assert cur.lastrowid is None
+    assert cur.lastrowid == 0
     # issue 2682
     cur.execute('''insert
                 into test
                 values (?)
                 ''', (1, ))
-    assert cur.lastrowid is not None
+    assert cur.lastrowid
     cur.execute('''insert\t into test values (?) ''', (1, ))
-    assert cur.lastrowid is not None
+    assert cur.lastrowid
 
 def test_authorizer_bad_value(con):
     def authorizer_cb(action, arg1, arg2, dbname, source):
@@ -312,3 +310,24 @@
     gc.collect()
     gc.collect()
     assert SQLiteBackend.success
+
+def test_locked_table(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    cur = con.execute("SELECT * FROM foo")  # foo() is locked while cur is active
+    with pytest.raises(_sqlite3.OperationalError):
+        con.execute("DROP TABLE foo")
+
+def test_cursor_close(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    cur = con.execute("SELECT * FROM foo")
+    cur.close()
+    con.execute("DROP TABLE foo")  # no error
+
+def test_cursor_del(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    con.execute("SELECT * FROM foo")
+    import gc; gc.collect()
+    con.execute("DROP TABLE foo")  # no error
diff --git a/lib-python/3/sqlite3/test/regression.py b/lib-python/3/sqlite3/test/regression.py
--- a/lib-python/3/sqlite3/test/regression.py
+++ b/lib-python/3/sqlite3/test/regression.py
@@ -127,6 +127,7 @@
         con.execute("create table foo(bar timestamp)")
         con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
         con.execute(SELECT)
+        support.gc_collect()  # PyPy change
         con.execute("drop table foo")
         con.execute("create table foo(bar integer)")
         con.execute("insert into foo(bar) values (5)")
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -233,7 +233,6 @@
         self.text_factory = _unicode_text_factory
 
         self._detect_types = detect_types
-        self._in_transaction = False
         self.isolation_level = isolation_level
 
         self.__cursors = []
@@ -433,7 +432,7 @@
 
     def _begin(self):
         statement_star = _ffi.new('sqlite3_stmt **')
-        ret = _lib.sqlite3_prepare_v2(self._db, self.__begin_statement, -1,
+        ret = _lib.sqlite3_prepare_v2(self._db, self._begin_statement, -1,
                                       statement_star, _ffi.NULL)
         try:
             if ret != _lib.SQLITE_OK:
@@ -441,14 +440,13 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = True
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
     def commit(self):
         self._check_thread()
         self._check_closed()
-        if not self._in_transaction:
+        if not self.in_transaction:
             return
 
         # PyPy fix for non-refcounting semantics: since 2.7.13 (and in
@@ -473,14 +471,13 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = False
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
     def rollback(self):
         self._check_thread()
         self._check_closed()
-        if not self._in_transaction:
+        if not self.in_transaction:
             return
 
         self.__do_all_statements(Statement._reset, True)
@@ -494,7 +491,6 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = False
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
@@ -687,10 +683,10 @@
                 self.__func_cache[callable] = trace_callback
         _lib.sqlite3_trace(self._db, trace_callback, _ffi.NULL)
 
-    if sys.version_info[0] >= 3:
-        def __get_in_transaction(self):
-            return self._in_transaction
-        in_transaction = property(__get_in_transaction)
+    @property
+    @_check_closed_wrap
+    def in_transaction(self):
+        return not _lib.sqlite3_get_autocommit(self._db)
 
     def __get_total_changes(self):
         self._check_closed()
@@ -710,7 +706,7 @@
             stmt = str("BEGIN " + val).upper()
             if stmt not in BEGIN_STATMENTS:
                 raise ValueError("invalid value for isolation_level")
-            self.__begin_statement = stmt.encode('utf-8')
+            self._begin_statement = stmt.encode('utf-8')
         self._isolation_level = val
     isolation_level = property(__get_isolation_level, __set_isolation_level)
 
@@ -745,6 +741,11 @@
 
         self.__initialized = True
 
+    def __del__(self):
+        # Since statements are cached, they can outlive their parent cursor
+        if self.__statement:
+            self.__statement._reset()
+
     def close(self):
         if not self.__initialized:
             raise ProgrammingError("Base Cursor.__init__ not called.")
@@ -876,24 +877,13 @@
             except AttributeError:
                 pass
             self.__rowcount = -1
+            if self.__statement:
+                self.__statement._reset()
             self.__statement = self.__connection._statement_cache.get(sql)
 
-            if self.__connection._isolation_level is not None:
-                if self.__statement._type in (
-                    _STMT_TYPE_UPDATE,
-                    _STMT_TYPE_DELETE,
-                    _STMT_TYPE_INSERT,
-                    _STMT_TYPE_REPLACE
-                ):
-                    if not self.__connection._in_transaction:
-                        self.__connection._begin()
-                elif self.__statement._type == _STMT_TYPE_OTHER:
-                    if self.__connection._in_transaction:
-                        self.__connection.commit()
-                elif self.__statement._type == _STMT_TYPE_SELECT:
-                    if multiple:
-                        raise ProgrammingError("You cannot execute SELECT "
-                                               "statements in executemany().")
+            if self.__connection._begin_statement and self.__statement._is_dml:
+                if _lib.sqlite3_get_autocommit(self.__connection._db):
+                    self.__connection._begin()
 
             for params in many_params:
                 self.__statement._set_params(params)
@@ -911,6 +901,16 @@
                     self.__connection._reset_already_committed_statements()
                     ret = _lib.sqlite3_step(self.__statement._statement)
 
+                if self.__statement._is_dml:
+                    if self.__rowcount == -1:
+                        self.__rowcount = 0
+                    self.__rowcount += _lib.sqlite3_changes(self.__connection._db)
+                else:
+                    self.__rowcount = -1
+
+                if not multiple:
+                    self.__lastrowid = _lib.sqlite3_last_insert_rowid(self.__connection._db)
+
                 if ret == _lib.SQLITE_ROW:
                     if multiple:
                         raise ProgrammingError("executemany() can only execute DML statements.")
@@ -923,28 +923,9 @@
                     self.__statement._reset()
                     raise self.__connection._get_exception(ret)
 
-                if self.__statement._type in (
-                    _STMT_TYPE_UPDATE,
-                    _STMT_TYPE_DELETE,
-                    _STMT_TYPE_INSERT,
-                    _STMT_TYPE_REPLACE
-                ):
-                    if self.__rowcount == -1:
-                        self.__rowcount = 0
-                    self.__rowcount += _lib.sqlite3_changes(self.__connection._db)
-
-                if not multiple and self.__statement._type in (
-                        # REPLACE is an alias for INSERT OR REPLACE
-                        _STMT_TYPE_INSERT, _STMT_TYPE_REPLACE):
-                    self.__lastrowid = _lib.sqlite3_last_insert_rowid(self.__connection._db)
-                else:
-                    self.__lastrowid = None
-
                 if multiple:
                     self.__statement._reset()
         finally:
-            self.__connection._in_transaction = \
-                not _lib.sqlite3_get_autocommit(self.__connection._db)
             self.__locked = False
         return self
 
@@ -1086,38 +1067,19 @@
         if '\0' in sql:
             raise ValueError("the query contains a null character")
 
-        
-        if sql:
-            first_word = sql.lstrip().split()[0].upper()
-            if first_word == '':
-                self._type = _STMT_TYPE_INVALID
-            if first_word == "SELECT":
-                self._type = _STMT_TYPE_SELECT
-            elif first_word == "INSERT":
-                self._type = _STMT_TYPE_INSERT
-            elif first_word == "UPDATE":
-                self._type = _STMT_TYPE_UPDATE
-            elif first_word == "DELETE":
-                self._type = _STMT_TYPE_DELETE
-            elif first_word == "REPLACE":
-                self._type = _STMT_TYPE_REPLACE
-            else:
-                self._type = _STMT_TYPE_OTHER
-        else:
-            self._type = _STMT_TYPE_INVALID
+        to_check = sql.lstrip().upper()
+        self._valid = bool(to_check)
+        self._is_dml = to_check.startswith(('INSERT', 'UPDATE', 'DELETE', 'REPLACE'))
 
-        if isinstance(sql, unicode):
-            sql = sql.encode('utf-8')
         statement_star = _ffi.new('sqlite3_stmt **')
         next_char = _ffi.new('char **')
-        c_sql = _ffi.new("char[]", sql)
+        c_sql = _ffi.new("char[]", sql.encode('utf-8'))
         ret = _lib.sqlite3_prepare_v2(self.__con._db, c_sql, -1,
                                       statement_star, next_char)
         self._statement = statement_star[0]
 
         if ret == _lib.SQLITE_OK and not self._statement:
             # an empty statement, work around that, as it's the least trouble
-            self._type = _STMT_TYPE_SELECT
             c_sql = _ffi.new("char[]", b"select 42")
             ret = _lib.sqlite3_prepare_v2(self.__con._db, c_sql, -1,
                                           statement_star, next_char)
@@ -1238,12 +1200,7 @@
             raise ValueError("parameters are of unsupported type")
 
     def _get_description(self):
-        if self._type in (
-            _STMT_TYPE_INSERT,
-            _STMT_TYPE_UPDATE,
-            _STMT_TYPE_DELETE,
-            _STMT_TYPE_REPLACE
-        ):
+        if self._is_dml:
             return None
         desc = []
         for i in xrange(_lib.sqlite3_column_count(self._statement)):
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -8,3 +8,7 @@
 .. branch: cpyext-speedup-tests-py36
 
 Make cpyext test faster, especially on py3.6
+
+.. branch: py3.6-sqlite
+
+Follow CPython's behaviour more closely in sqlite3

From pypy.commits at gmail.com  Fri Jan 10 15:28:10 2020
From: pypy.commits at gmail.com (antocuni)
Date: Fri, 10 Jan 2020 12:28:10 -0800 (PST)
Subject: [pypy-commit] pypy hpy: add support for legacy methods using the
 old C-API calling convention, which are wrapped through the cpyext
 machinery; test_cpy_compat now fully passes :)
Message-ID: <5e18de5a.1c69fb81.e874b.0845@mx.google.com>

Author: Antonio Cuni 
Branch: hpy
Changeset: r98519:bbc0f966d0be
Date: 2020-01-10 21:27 +0100
http://bitbucket.org/pypy/pypy/changeset/bbc0f966d0be/

Log:	add support for legacy methods using the old C-API calling
	convention, which are wrapped through the cpyext machinery;
	test_cpy_compat now fully passes :)

diff --git a/pypy/module/hpy_universal/interp_module.py b/pypy/module/hpy_universal/interp_module.py
--- a/pypy/module/hpy_universal/interp_module.py
+++ b/pypy/module/hpy_universal/interp_module.py
@@ -17,13 +17,42 @@
     if hpydef.c_m_methods:
         p = hpydef.c_m_methods
         i = 0
+        legacy_methoddefs = [] # for those using the old C-API calling convention
         while p[i].c_ml_name:
-            if not widen(p[i].c_ml_flags) & llapi._HPy_METH:
-                # we need to add support for legacy methods through cpyext
-                raise oefmt(space.w_NotImplementedError, "non-hpy method: %s",
-                            rffi.constcharp2str(p[i].c_ml_name))
-            w_extfunc = interp_extfunc.W_ExtensionFunction(p[i], w_mod)
-            space.setattr(w_mod, space.newtext(w_extfunc.name), w_extfunc)
+            if widen(p[i].c_ml_flags) & llapi._HPy_METH:
+                # hpy native methods
+                w_extfunc = interp_extfunc.W_ExtensionFunction(p[i], w_mod)
+                space.setattr(w_mod, space.newtext(w_extfunc.name), w_extfunc)
+            else:
+                # legacy cpyext-based methods, to be processed later
+                legacy_methoddefs.append(p[i])
             i += 1
+        if legacy_methoddefs:
+            attach_legacy_methods(space, legacy_methoddefs, w_mod, modname)
     #
     return handles.new(space, w_mod)
+
+
+def attach_legacy_methods(space, hpymethods, w_mod, modname):
+    from pypy.module.cpyext.methodobject import PyMethodDef, PyCFunction
+    from pypy.module.cpyext.modsupport import convert_method_defs
+    PyMethodDefP = rffi.CArrayPtr(PyMethodDef)
+
+    # convert hpymethods into a C array of PyMethodDef
+    dict_w = {}
+    n = len(hpymethods)
+    with lltype.scoped_alloc(PyMethodDefP.TO, n+1) as pymethods:
+        for i in range(n):
+            src = hpymethods[i] # HPyMethodDef
+            dst = pymethods[i]  # PyMethodDef
+            dst.c_ml_name = src.c_ml_name
+            dst.c_ml_doc = src.c_ml_doc
+            # for legacy methods, ml_meth contains a PyCFunction which can be
+            # called using the old C-API/cpyext calling convention
+            dst.c_ml_meth = rffi.cast(PyCFunction, src.c_ml_meth)
+            rffi.setintfield(dst, 'c_ml_flags', widen(src.c_ml_flags) & ~llapi._HPy_METH)
+        pymethods[n].c_ml_name = lltype.nullptr(rffi.CONST_CCHARP.TO)
+        convert_method_defs(space, dict_w, pymethods, None, w_mod, modname)
+
+    for key, w_func in dict_w.items():
+        space.setattr(w_mod, space.newtext(key), w_func)

From pypy.commits at gmail.com  Fri Jan 10 19:12:35 2020
From: pypy.commits at gmail.com (antocuni)
Date: Fri, 10 Jan 2020 16:12:35 -0800 (PST)
Subject: [pypy-commit] pypy dummy-importlib2: close this branch as well: it
 turns out that the slowdown is NOT caused by _frozen_importlib itself,
 but by the fact that cpyext tests end up importing half of the stblib
 directly or indirectly. Will fix this in another branch
Message-ID: <5e1912f3.1c69fb81.fd147.3a89@mx.google.com>

Author: Antonio Cuni 
Branch: dummy-importlib2
Changeset: r98520:e55f99d3fe5a
Date: 2019-12-23 16:06 +0000
http://bitbucket.org/pypy/pypy/changeset/e55f99d3fe5a/

Log:	close this branch as well: it turns out that the slowdown is NOT
	caused by _frozen_importlib itself, but by the fact that cpyext
	tests end up importing half of the stblib directly or indirectly.
	Will fix this in another branch


From pypy.commits at gmail.com  Fri Jan 10 19:12:37 2020
From: pypy.commits at gmail.com (antocuni)
Date: Fri, 10 Jan 2020 16:12:37 -0800 (PST)
Subject: [pypy-commit] pypy hpy: try a translation fix
Message-ID: <5e1912f5.1c69fb81.89099.2a46@mx.google.com>

Author: Antonio Cuni 
Branch: hpy
Changeset: r98521:a8d815f56da1
Date: 2020-01-10 21:50 +0100
http://bitbucket.org/pypy/pypy/changeset/a8d815f56da1/

Log:	try a translation fix

diff --git a/pypy/module/hpy_universal/interp_module.py b/pypy/module/hpy_universal/interp_module.py
--- a/pypy/module/hpy_universal/interp_module.py
+++ b/pypy/module/hpy_universal/interp_module.py
@@ -52,7 +52,10 @@
             dst.c_ml_meth = rffi.cast(PyCFunction, src.c_ml_meth)
             rffi.setintfield(dst, 'c_ml_flags', widen(src.c_ml_flags) & ~llapi._HPy_METH)
         pymethods[n].c_ml_name = lltype.nullptr(rffi.CONST_CCHARP.TO)
-        convert_method_defs(space, dict_w, pymethods, None, w_mod, modname)
+        #
+        # convert_method_defs expects a PyMethodDef*, not a PyMethodDef[]
+        p_pymethods = rffi.cast(lltype.Ptr(PyMethodDef), pymethods)
+        convert_method_defs(space, dict_w, p_pymethods, None, w_mod, modname)
 
     for key, w_func in dict_w.items():
         space.setattr(w_mod, space.newtext(key), w_func)

From pypy.commits at gmail.com  Sat Jan 11 03:51:00 2020
From: pypy.commits at gmail.com (arigo)
Date: Sat, 11 Jan 2020 00:51:00 -0800 (PST)
Subject: [pypy-commit] cffi default: Issue #439
Message-ID: <5e198c74.1c69fb81.b9330.7b28@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r3326:8cb2dd342e29
Date: 2020-01-11 09:50 +0100
http://bitbucket.org/cffi/cffi/changeset/8cb2dd342e29/

Log:	Issue #439

	Oops, potentially bad typo in the overview page

diff --git a/doc/source/overview.rst b/doc/source/overview.rst
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -335,7 +335,7 @@
    
       ffibuilder.set_source("_pi",  # name of the output C extension
       """
-          #include "pi.h"',
+          #include "pi.h"
       """,
           sources=['pi.c'],   # includes pi.c as additional sources
           libraries=['m'])    # on Unix, link with the math library

From pypy.commits at gmail.com  Sat Jan 11 03:53:44 2020
From: pypy.commits at gmail.com (arigo)
Date: Sat, 11 Jan 2020 00:53:44 -0800 (PST)
Subject: [pypy-commit] cffi release-1.13: back-port typo fix
Message-ID: <5e198d18.1c69fb81.97cd6.7bef@mx.google.com>

Author: Armin Rigo 
Branch: release-1.13
Changeset: r3327:7bb4532bcfcc
Date: 2020-01-11 09:53 +0100
http://bitbucket.org/cffi/cffi/changeset/7bb4532bcfcc/

Log:	back-port typo fix

diff --git a/doc/source/overview.rst b/doc/source/overview.rst
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -335,7 +335,7 @@
    
       ffibuilder.set_source("_pi",  # name of the output C extension
       """
-          #include "pi.h"',
+          #include "pi.h"
       """,
           sources=['pi.c'],   # includes pi.c as additional sources
           libraries=['m'])    # on Unix, link with the math library

From pypy.commits at gmail.com  Sun Jan 12 03:38:21 2020
From: pypy.commits at gmail.com (mattip)
Date: Sun, 12 Jan 2020 00:38:21 -0800 (PST)
Subject: [pypy-commit] pypy default: typo
Message-ID: <5e1adafd.1c69fb81.1ddd4.732a@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r98526:84a1f6454bd1
Date: 2020-01-12 19:37 +1100
http://bitbucket.org/pypy/pypy/changeset/84a1f6454bd1/

Log:	typo

diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -287,7 +287,7 @@
 
         if not slot_func_helper:
             if not slot_apifunc:
-                if WARN_MISSING_SLOTS
+                if WARN_MISSING_SLOTS:
                     warn_missing_slot(space, method_name, slot_name, w_type)
                 continue
             slot_func_helper = slot_apifunc.get_llhelper(space)

From pypy.commits at gmail.com  Sun Jan 12 16:07:08 2020
From: pypy.commits at gmail.com (mattip)
Date: Sun, 12 Jan 2020 13:07:08 -0800 (PST)
Subject: [pypy-commit] benchmarks default: add debug print of results
Message-ID: <5e1b8a7c.1c69fb81.d1ba.f394@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r436:73a32d3470b6
Date: 2020-01-13 08:05 +1100
http://bitbucket.org/pypy/benchmarks/changeset/73a32d3470b6/

Log:	add debug print of results

diff --git a/saveresults.py b/saveresults.py
--- a/saveresults.py
+++ b/saveresults.py
@@ -27,6 +27,7 @@
 import sys
 import time
 import urllib
+import pprint
 try:
     import urllib2
 except ImportError:
@@ -106,6 +107,7 @@
             (str(datetime.today()), data[0]['executable'],
              str(data[0]['commitid']), data[0]['benchmark']))
     print(info)
+    pprint.pprint(data)
     try:
         retries = [1, 2, 3, 6]
         while True:

From pypy.commits at gmail.com  Mon Jan 13 13:01:08 2020
From: pypy.commits at gmail.com (mattip)
Date: Mon, 13 Jan 2020 10:01:08 -0800 (PST)
Subject: [pypy-commit] buildbot default: change order: first create
 virtualenv, then update pip, setuptools
Message-ID: <5e1cb064.1c69fb81.f7da4.1778@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r1125:5fdc899d981d
Date: 2020-01-14 04:58 +1100
http://bitbucket.org/pypy/buildbot/changeset/5fdc899d981d/

Log:	change order: first create virtualenv, then update pip, setuptools

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -503,17 +503,17 @@
             workdir='venv',
             haltOnFailure=False))
         factory.addStep(ShellCmd(
+            description="Create virtualenv",
+            command=prefix + [target, '-mvirtualenv', '--clear', venv_dir],
+            workdir='venv',
+            flunkOnFailure=True))
+        factory.addStep(ShellCmd(
             description="Install recent virtualenv",
             command=prefix + [target, '-mpip', 'install', '--upgrade',
                               'pip', 'setuptools', virt_package],
             workdir='venv',
             flunkOnFailure=True))
         factory.addStep(ShellCmd(
-            description="Create virtualenv",
-            command=prefix + [target, '-mvirtualenv', '--clear', venv_dir],
-            workdir='venv',
-            flunkOnFailure=True))
-        factory.addStep(ShellCmd(
             description="Install extra tests requirements",
             command=prefix + [virt_pypy, '-m', 'pip', 'install',
                 '-r', '../build/extra_tests/requirements.txt'],

From pypy.commits at gmail.com  Tue Jan 14 01:54:52 2020
From: pypy.commits at gmail.com (arigo)
Date: Mon, 13 Jan 2020 22:54:52 -0800 (PST)
Subject: [pypy-commit] pypy default: #3151
Message-ID: <5e1d65bc.1c69fb81.fd147.c4e9@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98527:21d9fdb98805
Date: 2020-01-14 07:53 +0100
http://bitbucket.org/pypy/pypy/changeset/21d9fdb98805/

Log:	#3151

	Small fix in the Makefile

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 all: pypy-c cffi_imports
 
 PYPY_EXECUTABLE := $(shell which pypy)
-URAM := $(shell python -c "import sys; print 4.5 if sys.maxint>1<<32 else 2.5")
 
 ifeq ($(PYPY_EXECUTABLE),)
 RUNINTERP = python
@@ -10,6 +9,8 @@
 RUNINTERP = $(PYPY_EXECUTABLE)
 endif
 
+URAM := $(shell $(RUNINTERP) -c "import sys; print 4.5 if sys.maxint>1<<32 else 2.5")
+
 .PHONY: pypy-c cffi_imports
 
 pypy-c:

From pypy.commits at gmail.com  Tue Jan 14 04:14:19 2020
From: pypy.commits at gmail.com (arigo)
Date: Tue, 14 Jan 2020 01:14:19 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: Add an empty list
Message-ID: <5e1d866b.1c69fb81.b9030.26a0@mx.google.com>

Author: Armin Rigo 
Branch: extradoc
Changeset: r5974:af6a9a930dd1
Date: 2020-01-14 10:14 +0100
http://bitbucket.org/pypy/extradoc/changeset/af6a9a930dd1/

Log:	Add an empty list

diff --git a/sprintinfo/leysin-winter-2020/people.txt b/sprintinfo/leysin-winter-2020/people.txt
new file mode 100644
--- /dev/null
+++ b/sprintinfo/leysin-winter-2020/people.txt
@@ -0,0 +1,14 @@
+
+People coming to the Leysin sprint Winter 2020
+==================================================
+
+People who have a ``?`` in their arrive/depart or accomodation
+column are known to be coming but there are no details 
+available yet from them.
+
+==================== ============== =======================
+    Name              Arrive/Depart     Accomodation 
+==================== ============== =======================
+Armin Rigo                          private
+==================== ============== =======================
+

From pypy.commits at gmail.com  Tue Jan 14 05:34:09 2020
From: pypy.commits at gmail.com (antocuni)
Date: Tue, 14 Jan 2020 02:34:09 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: fix rst
Message-ID: <5e1d9921.1c69fb81.137e8.ef62@mx.google.com>

Author: Antonio Cuni 
Branch: extradoc
Changeset: r5975:b86ad5543fec
Date: 2020-01-14 11:33 +0100
http://bitbucket.org/pypy/extradoc/changeset/b86ad5543fec/

Log:	fix rst

diff --git a/blog/draft/2019-12-hpy-sprint.rst b/blog/draft/2019-12-hpy-sprint.rst
--- a/blog/draft/2019-12-hpy-sprint.rst
+++ b/blog/draft/2019-12-hpy-sprint.rst
@@ -153,7 +153,7 @@
     and its length, instead of a fully constructed tuple: passing a tuple
     makes sense on CPython where you have it anyway, but it might be an
     unnecessary burden for alternate implementations.  Note that this is
-    similar to the new `METH_FASTCALL` which was introduced in CPython.
+    similar to the new `METH_FASTCALL`_ which was introduced in CPython.
 
   - HPy relies a lot on C macros, which most of the time are needed to support
     the HPy/CPython ABI compilation mode. For example, ``HPy_DEF_METH_VARARGS``
@@ -217,7 +217,7 @@
 
   - it uses only a small subset of the Python API
 
-This repo contains the `HPy port of ultrajson`. This commit_ shows an example
+This repo contains the `HPy port of ultrajson`_. This commit_ shows an example
 of what the porting looks like.
 
 ``ujson_hpy`` is also a very good example of incremental migration: so far

From pypy.commits at gmail.com  Tue Jan 14 05:34:11 2020
From: pypy.commits at gmail.com (antocuni)
Date: Tue, 14 Jan 2020 02:34:11 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: add myself
Message-ID: <5e1d9923.1c69fb81.c3ea4.0d55@mx.google.com>

Author: Antonio Cuni 
Branch: extradoc
Changeset: r5976:c7f49c18f76c
Date: 2020-01-14 11:33 +0100
http://bitbucket.org/pypy/extradoc/changeset/c7f49c18f76c/

Log:	add myself

diff --git a/sprintinfo/leysin-winter-2020/people.txt b/sprintinfo/leysin-winter-2020/people.txt
--- a/sprintinfo/leysin-winter-2020/people.txt
+++ b/sprintinfo/leysin-winter-2020/people.txt
@@ -3,12 +3,12 @@
 ==================================================
 
 People who have a ``?`` in their arrive/depart or accomodation
-column are known to be coming but there are no details 
+column are known to be coming but there are no details
 available yet from them.
 
 ==================== ============== =======================
-    Name              Arrive/Depart     Accomodation 
+    Name              Arrive/Depart     Accomodation
 ==================== ============== =======================
 Armin Rigo                          private
+Antonio Cuni          flexbible     Les Airelles, preferably single room
 ==================== ============== =======================
-

From pypy.commits at gmail.com  Tue Jan 14 07:23:00 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Tue, 14 Jan 2020 04:23:00 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.6
Message-ID: <5e1db2a4.1c69fb81.618c2.ec11@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98528:54bf5e2f78e0
Date: 2020-01-14 13:15 +0100
http://bitbucket.org/pypy/pypy/changeset/54bf5e2f78e0/

Log:	merge py3.6

diff --git a/extra_tests/cffi_tests/cffi0/backend_tests.py b/extra_tests/cffi_tests/cffi0/backend_tests.py
--- a/extra_tests/cffi_tests/cffi0/backend_tests.py
+++ b/extra_tests/cffi_tests/cffi0/backend_tests.py
@@ -1242,7 +1242,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1261,7 +1261,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi0/test_zdistutils.py b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
--- a/extra_tests/cffi_tests/cffi0/test_zdistutils.py
+++ b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
@@ -90,7 +90,7 @@
         csrc = '/*hi there %s!2*/\n#include \n' % self
         v = Verifier(ffi, csrc, force_generic_engine=self.generic,
                      libraries=[self.lib_m])
-        basename = self.__class__.__name__ + 'test_compile_module'
+        basename = self.__class__.__name__[:10] + '_test_compile_module'
         v.modulefilename = filename = str(udir.join(basename + '.so'))
         v.compile_module()
         assert filename == v.modulefilename
diff --git a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
--- a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
+++ b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
@@ -1221,7 +1221,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1239,7 +1239,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi1/test_recompiler.py b/extra_tests/cffi_tests/cffi1/test_recompiler.py
--- a/extra_tests/cffi_tests/cffi1/test_recompiler.py
+++ b/extra_tests/cffi_tests/cffi1/test_recompiler.py
@@ -27,13 +27,14 @@
 
 def verify(ffi, module_name, source, *args, **kwds):
     no_cpp = kwds.pop('no_cpp', False)
+    ignore_warnings = kwds.pop('ignore_warnings', False)
     kwds.setdefault('undef_macros', ['NDEBUG'])
     module_name = '_CFFI_' + module_name
     ffi.set_source(module_name, source)
     if not os.environ.get('NO_CPP') and not no_cpp:   # test the .cpp mode too
         kwds.setdefault('source_extension', '.cpp')
         source = 'extern "C" {\n%s\n}' % (source,)
-    elif sys.platform != 'win32':
+    elif sys.platform != 'win32' and not ignore_warnings:
         # add '-Werror' to the existing 'extra_compile_args' flags
         from extra_tests.cffi_tests.support import extra_compile_args
         kwds['extra_compile_args'] = (kwds.get('extra_compile_args', []) +
@@ -137,7 +138,8 @@
     import math
     ffi = FFI()
     ffi.cdef("float sin(double); double cos(double);")
-    lib = verify(ffi, 'test_math_sin', '#include ')
+    lib = verify(ffi, 'test_math_sin', '#include ',
+                 ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_repr_lib():
@@ -646,7 +648,7 @@
     ffi.cdef("sshort_t ff3(sshort_t);")
     lib = verify(ffi, "test_include_3",
                  "typedef short sshort_t; //usually from a #include\n"
-                 "sshort_t ff3(sshort_t x) { return x + 42; }")
+                 "sshort_t ff3(sshort_t x) { return (sshort_t)(x + 42); }")
     assert lib.ff3(10) == 52
     assert ffi.typeof(ffi.cast("sshort_t", 42)) is ffi.typeof("short")
     assert ffi1.typeof("sshort_t") is ffi.typeof("sshort_t")
@@ -755,7 +757,7 @@
     ffi = FFI()
     ffi.cdef(unicode("float sin(double); double cos(double);"))
     lib = verify(ffi, 'test_math_sin_unicode', unicode('#include '),
-                 libraries=[unicode(lib_m)])
+                 libraries=[unicode(lib_m)], ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_incomplete_struct_as_arg():
@@ -883,15 +885,20 @@
     e5 = py.test.raises(TypeError, lib.foo2)
     e6 = py.test.raises(TypeError, lib.foo2, 42)
     e7 = py.test.raises(TypeError, lib.foo2, 45, 46, 47)
-    assert str(e1.value) == "foo0() takes no arguments (1 given)"
-    assert str(e2.value) == "foo0() takes no arguments (2 given)"
-    assert str(e3.value) == "foo1() takes exactly one argument (0 given)"
-    assert str(e4.value) == "foo1() takes exactly one argument (2 given)"
-    assert str(e5.value) in ["foo2 expected 2 arguments, got 0",
+    def st1(s):
+        s = str(s)
+        if s.startswith("_CFFI_test_unpack_args.CompiledLib."):
+            s = s[len("_CFFI_test_unpack_args.CompiledLib."):]
+        return s
+    assert st1(e1.value) == "foo0() takes no arguments (1 given)"
+    assert st1(e2.value) == "foo0() takes no arguments (2 given)"
+    assert st1(e3.value) == "foo1() takes exactly one argument (0 given)"
+    assert st1(e4.value) == "foo1() takes exactly one argument (2 given)"
+    assert st1(e5.value) in ["foo2 expected 2 arguments, got 0",
                              "foo2() takes exactly 2 arguments (0 given)"]
-    assert str(e6.value) in ["foo2 expected 2 arguments, got 1",
+    assert st1(e6.value) in ["foo2 expected 2 arguments, got 1",
                              "foo2() takes exactly 2 arguments (1 given)"]
-    assert str(e7.value) in ["foo2 expected 2 arguments, got 3",
+    assert st1(e7.value) in ["foo2 expected 2 arguments, got 3",
                              "foo2() takes exactly 2 arguments (3 given)"]
 
 def test_address_of_function():
@@ -899,7 +906,7 @@
     ffi.cdef("long myfunc(long x);")
     lib = verify(ffi, "test_addressof_function", """
         char myfunc(char x) { return (char)(x + 42); }
-    """)
+    """, ignore_warnings=True)
     assert lib.myfunc(5) == 47
     assert lib.myfunc(0xABC05) == 47
     assert not isinstance(lib.myfunc, ffi.CData)
@@ -1172,7 +1179,7 @@
     lib = verify(ffi, 'test_some_float_invalid_3', """
         typedef long double foo_t;
         foo_t neg(foo_t x) { return -x; }
-    """)
+    """, ignore_warnings=True)
     if ffi.sizeof("long double") == ffi.sizeof("double"):
         assert lib.neg(12.3) == -12.3
     else:
@@ -1846,7 +1853,7 @@
     ffi = FFI()
     ffi.cdef("float f1(double);")
     lib = verify(ffi, 'test_introspect_function', """
-        float f1(double x) { return x; }
+        float f1(double x) { return (float)x; }
     """)
     assert dir(lib) == ['f1']
     FUNC = ffi.typeof(lib.f1)
@@ -2151,7 +2158,8 @@
     lib = verify(ffi, "test_call_with_nested_anonymous_struct", """
         struct foo { int a; union { int b, c; }; };
         struct foo f(void) {
-            struct foo s = { 40 };
+            struct foo s;
+            s.a = 40;
             s.b = 200;
             return s;
         }
diff --git a/extra_tests/cffi_tests/support.py b/extra_tests/cffi_tests/support.py
--- a/extra_tests/cffi_tests/support.py
+++ b/extra_tests/cffi_tests/support.py
@@ -2,7 +2,7 @@
 import sys, os
 
 if sys.version_info < (3,):
-    __all__ = ['u']
+    __all__ = ['u', 'arraytostring']
 
     class U(object):
         def __add__(self, other):
@@ -13,12 +13,16 @@
     assert u+'a\x00b' == eval(r"u'a\x00b'")
     assert u+'a\u1234b' == eval(r"u'a\u1234b'")
     assert u+'a\U00012345b' == eval(r"u'a\U00012345b'")
+    def arraytostring(a):
+        return a.tostring()
 
 else:
-    __all__ = ['u', 'unicode', 'long']
+    __all__ = ['u', 'unicode', 'long', 'arraytostring']
     u = ""
     unicode = str
     long = int
+    def arraytostring(a):
+        return a.tobytes()
 
 
 class StdErrCapture(object):
diff --git a/extra_tests/test_sqlite3.py b/extra_tests/test_sqlite3.py
--- a/extra_tests/test_sqlite3.py
+++ b/extra_tests/test_sqlite3.py
@@ -88,8 +88,7 @@
     with pytest.raises(StopIteration):
         next(cur)
 
-    with pytest.raises(_sqlite3.ProgrammingError):
-        cur.executemany('select 1', [])
+    cur.executemany('select 1', [])
     with pytest.raises(StopIteration):
         next(cur)
 
@@ -201,8 +200,8 @@
 
 def test_explicit_begin(con):
     con.execute('BEGIN')
-    con.execute('BEGIN ')
-    con.execute('BEGIN')
+    with pytest.raises(_sqlite3.OperationalError):
+        con.execute('BEGIN ')
     con.commit()
     con.execute('BEGIN')
     con.commit()
@@ -212,7 +211,6 @@
     con.execute('select 1')
 
 def test_returning_blob_must_own_memory(con):
-    import gc
     con.create_function("returnblob", 0, lambda: memoryview(b"blob"))
     cur = con.execute("select returnblob()")
     val = cur.fetchone()[0]
@@ -228,15 +226,15 @@
     cur = con.cursor()
     cur.execute("create table test(a)")
     cur.executemany("insert into test values (?)", [[1], [2], [3]])
-    assert cur.lastrowid is None
+    assert cur.lastrowid == 0
     # issue 2682
     cur.execute('''insert
                 into test
                 values (?)
                 ''', (1, ))
-    assert cur.lastrowid is not None
+    assert cur.lastrowid
     cur.execute('''insert\t into test values (?) ''', (1, ))
-    assert cur.lastrowid is not None
+    assert cur.lastrowid
 
 def test_authorizer_bad_value(con):
     def authorizer_cb(action, arg1, arg2, dbname, source):
@@ -312,3 +310,24 @@
     gc.collect()
     gc.collect()
     assert SQLiteBackend.success
+
+def test_locked_table(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    cur = con.execute("SELECT * FROM foo")  # foo() is locked while cur is active
+    with pytest.raises(_sqlite3.OperationalError):
+        con.execute("DROP TABLE foo")
+
+def test_cursor_close(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    cur = con.execute("SELECT * FROM foo")
+    cur.close()
+    con.execute("DROP TABLE foo")  # no error
+
+def test_cursor_del(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    con.execute("SELECT * FROM foo")
+    import gc; gc.collect()
+    con.execute("DROP TABLE foo")  # no error
diff --git a/lib-python/3/sqlite3/test/regression.py b/lib-python/3/sqlite3/test/regression.py
--- a/lib-python/3/sqlite3/test/regression.py
+++ b/lib-python/3/sqlite3/test/regression.py
@@ -127,6 +127,7 @@
         con.execute("create table foo(bar timestamp)")
         con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
         con.execute(SELECT)
+        support.gc_collect()  # PyPy change
         con.execute("drop table foo")
         con.execute("create table foo(bar integer)")
         con.execute("insert into foo(bar) values (5)")
diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py
--- a/lib_pypy/_curses_build.py
+++ b/lib_pypy/_curses_build.py
@@ -6,9 +6,7 @@
     static const int NCURSES_VERSION_MINOR;
 '''
 
-version = (0, 0)
 def find_library(options):
-    global version
     for library in options:
         ffi = FFI()
         ffi.cdef(version_str)
@@ -17,7 +15,6 @@
             ffi.compile()
             import _curses_cffi_check
             lib = _curses_cffi_check.lib
-            version = (lib.NCURSES_VERSION_MAJOR, lib.NCURSES_VERSION_MINOR)
         except VerificationError as e:
             e_last = e
             continue
@@ -385,7 +382,7 @@
 void _m_getsyx(int *yx);
 """)
 
-if version > (5, 7):
+if 'ncursesw' in libs:
     ffi.cdef("""
 typedef int... wint_t;
 int wget_wch(WINDOW *, wint_t *);
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -233,7 +233,6 @@
         self.text_factory = _unicode_text_factory
 
         self._detect_types = detect_types
-        self._in_transaction = False
         self.isolation_level = isolation_level
 
         self.__cursors = []
@@ -433,7 +432,7 @@
 
     def _begin(self):
         statement_star = _ffi.new('sqlite3_stmt **')
-        ret = _lib.sqlite3_prepare_v2(self._db, self.__begin_statement, -1,
+        ret = _lib.sqlite3_prepare_v2(self._db, self._begin_statement, -1,
                                       statement_star, _ffi.NULL)
         try:
             if ret != _lib.SQLITE_OK:
@@ -441,14 +440,13 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = True
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
     def commit(self):
         self._check_thread()
         self._check_closed()
-        if not self._in_transaction:
+        if not self.in_transaction:
             return
 
         # PyPy fix for non-refcounting semantics: since 2.7.13 (and in
@@ -473,14 +471,13 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = False
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
     def rollback(self):
         self._check_thread()
         self._check_closed()
-        if not self._in_transaction:
+        if not self.in_transaction:
             return
 
         self.__do_all_statements(Statement._reset, True)
@@ -494,7 +491,6 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = False
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
@@ -687,10 +683,10 @@
                 self.__func_cache[callable] = trace_callback
         _lib.sqlite3_trace(self._db, trace_callback, _ffi.NULL)
 
-    if sys.version_info[0] >= 3:
-        def __get_in_transaction(self):
-            return self._in_transaction
-        in_transaction = property(__get_in_transaction)
+    @property
+    @_check_closed_wrap
+    def in_transaction(self):
+        return not _lib.sqlite3_get_autocommit(self._db)
 
     def __get_total_changes(self):
         self._check_closed()
@@ -710,7 +706,7 @@
             stmt = str("BEGIN " + val).upper()
             if stmt not in BEGIN_STATMENTS:
                 raise ValueError("invalid value for isolation_level")
-            self.__begin_statement = stmt.encode('utf-8')
+            self._begin_statement = stmt.encode('utf-8')
         self._isolation_level = val
     isolation_level = property(__get_isolation_level, __set_isolation_level)
 
@@ -745,6 +741,11 @@
 
         self.__initialized = True
 
+    def __del__(self):
+        # Since statements are cached, they can outlive their parent cursor
+        if self.__statement:
+            self.__statement._reset()
+
     def close(self):
         if not self.__initialized:
             raise ProgrammingError("Base Cursor.__init__ not called.")
@@ -876,24 +877,13 @@
             except AttributeError:
                 pass
             self.__rowcount = -1
+            if self.__statement:
+                self.__statement._reset()
             self.__statement = self.__connection._statement_cache.get(sql)
 
-            if self.__connection._isolation_level is not None:
-                if self.__statement._type in (
-                    _STMT_TYPE_UPDATE,
-                    _STMT_TYPE_DELETE,
-                    _STMT_TYPE_INSERT,
-                    _STMT_TYPE_REPLACE
-                ):
-                    if not self.__connection._in_transaction:
-                        self.__connection._begin()
-                elif self.__statement._type == _STMT_TYPE_OTHER:
-                    if self.__connection._in_transaction:
-                        self.__connection.commit()
-                elif self.__statement._type == _STMT_TYPE_SELECT:
-                    if multiple:
-                        raise ProgrammingError("You cannot execute SELECT "
-                                               "statements in executemany().")
+            if self.__connection._begin_statement and self.__statement._is_dml:
+                if _lib.sqlite3_get_autocommit(self.__connection._db):
+                    self.__connection._begin()
 
             for params in many_params:
                 self.__statement._set_params(params)
@@ -911,6 +901,16 @@
                     self.__connection._reset_already_committed_statements()
                     ret = _lib.sqlite3_step(self.__statement._statement)
 
+                if self.__statement._is_dml:
+                    if self.__rowcount == -1:
+                        self.__rowcount = 0
+                    self.__rowcount += _lib.sqlite3_changes(self.__connection._db)
+                else:
+                    self.__rowcount = -1
+
+                if not multiple:
+                    self.__lastrowid = _lib.sqlite3_last_insert_rowid(self.__connection._db)
+
                 if ret == _lib.SQLITE_ROW:
                     if multiple:
                         raise ProgrammingError("executemany() can only execute DML statements.")
@@ -923,28 +923,9 @@
                     self.__statement._reset()
                     raise self.__connection._get_exception(ret)
 
-                if self.__statement._type in (
-                    _STMT_TYPE_UPDATE,
-                    _STMT_TYPE_DELETE,
-                    _STMT_TYPE_INSERT,
-                    _STMT_TYPE_REPLACE
-                ):
-                    if self.__rowcount == -1:
-                        self.__rowcount = 0
-                    self.__rowcount += _lib.sqlite3_changes(self.__connection._db)
-
-                if not multiple and self.__statement._type in (
-                        # REPLACE is an alias for INSERT OR REPLACE
-                        _STMT_TYPE_INSERT, _STMT_TYPE_REPLACE):
-                    self.__lastrowid = _lib.sqlite3_last_insert_rowid(self.__connection._db)
-                else:
-                    self.__lastrowid = None
-
                 if multiple:
                     self.__statement._reset()
         finally:
-            self.__connection._in_transaction = \
-                not _lib.sqlite3_get_autocommit(self.__connection._db)
             self.__locked = False
         return self
 
@@ -1086,38 +1067,19 @@
         if '\0' in sql:
             raise ValueError("the query contains a null character")
 
-        
-        if sql:
-            first_word = sql.lstrip().split()[0].upper()
-            if first_word == '':
-                self._type = _STMT_TYPE_INVALID
-            if first_word == "SELECT":
-                self._type = _STMT_TYPE_SELECT
-            elif first_word == "INSERT":
-                self._type = _STMT_TYPE_INSERT
-            elif first_word == "UPDATE":
-                self._type = _STMT_TYPE_UPDATE
-            elif first_word == "DELETE":
-                self._type = _STMT_TYPE_DELETE
-            elif first_word == "REPLACE":
-                self._type = _STMT_TYPE_REPLACE
-            else:
-                self._type = _STMT_TYPE_OTHER
-        else:
-            self._type = _STMT_TYPE_INVALID
+        to_check = sql.lstrip().upper()
+        self._valid = bool(to_check)
+        self._is_dml = to_check.startswith(('INSERT', 'UPDATE', 'DELETE', 'REPLACE'))
 
-        if isinstance(sql, unicode):
-            sql = sql.encode('utf-8')
         statement_star = _ffi.new('sqlite3_stmt **')
         next_char = _ffi.new('char **')
-        c_sql = _ffi.new("char[]", sql)
+        c_sql = _ffi.new("char[]", sql.encode('utf-8'))
         ret = _lib.sqlite3_prepare_v2(self.__con._db, c_sql, -1,
                                       statement_star, next_char)
         self._statement = statement_star[0]
 
         if ret == _lib.SQLITE_OK and not self._statement:
             # an empty statement, work around that, as it's the least trouble
-            self._type = _STMT_TYPE_SELECT
             c_sql = _ffi.new("char[]", b"select 42")
             ret = _lib.sqlite3_prepare_v2(self.__con._db, c_sql, -1,
                                           statement_star, next_char)
@@ -1238,12 +1200,7 @@
             raise ValueError("parameters are of unsupported type")
 
     def _get_description(self):
-        if self._type in (
-            _STMT_TYPE_INSERT,
-            _STMT_TYPE_UPDATE,
-            _STMT_TYPE_DELETE,
-            _STMT_TYPE_REPLACE
-        ):
+        if self._is_dml:
             return None
         desc = []
         for i in xrange(_lib.sqlite3_column_count(self._statement)):
diff --git a/lib_pypy/cffi/recompiler.py b/lib_pypy/cffi/recompiler.py
--- a/lib_pypy/cffi/recompiler.py
+++ b/lib_pypy/cffi/recompiler.py
@@ -1216,7 +1216,8 @@
             size_of_result = '(int)sizeof(%s)' % (
                 tp.result.get_c_name('', context),)
         prnt('static struct _cffi_externpy_s _cffi_externpy__%s =' % name)
-        prnt('  { "%s.%s", %s };' % (self.module_name, name, size_of_result))
+        prnt('  { "%s.%s", %s, 0, 0 };' % (
+            self.module_name, name, size_of_result))
         prnt()
         #
         arguments = []
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -8,3 +8,7 @@
 .. branch: cpyext-speedup-tests-py36
 
 Make cpyext test faster, especially on py3.6
+
+.. branch: py3.6-sqlite
+
+Follow CPython's behaviour more closely in sqlite3
diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -202,6 +202,19 @@
     return BaseObjSpace.exception_getclass(space, w_obj)
 
 def exception_issubclass_w(space, w_cls1, w_cls2):
+    if (space.type(w_cls1) is space.w_type and
+        space.type(w_cls2) is space.w_type):
+        return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
+    #
+    if (not exception_is_valid_class_w(space, w_cls2) or
+        not exception_is_valid_class_w(space, w_cls1)):
+        return False
+    #
+    # The rest is the rare slow case.  Use the general logic of issubclass()
+    # (issue #3149).  CPython 3.x doesn't do that (but there is a
+    # many-years issue report: https://bugs.python.org/issue12029), and
+    # there are probably tests, so we won't call abstract_issubclass_w()
+    # either in PyPy3.
     return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
 
 # ____________________________________________________________
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -249,3 +249,25 @@
                 return False
 
         assert issubclass(42, M()) is False
+
+    def test_exception_match_does_not_call_subclasscheck(self):
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            raise ValueError
+        except ValueError:       # Python 3.x behaviour
+            pass
+
+    def test_exception_raising_does_not_call_subclasscheck(self):
+        # test skipped: unsure how to get a non-normalized exception
+        # from pure Python.
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            skip("non-normalized exception") #raise Special, ValueError()
+        except Special:
+            pass
diff --git a/pypy/module/cpyext/include/pyport.h b/pypy/module/cpyext/include/pyport.h
--- a/pypy/module/cpyext/include/pyport.h
+++ b/pypy/module/cpyext/include/pyport.h
@@ -5,68 +5,34 @@
 #include 
 #endif
 
-/* typedefs for some C9X-defined synonyms for integral types. */
-#ifdef HAVE_LONG_LONG
+/* long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG 1
+#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. */
-#define PY_LLONG_MAX __LONG_LONG_MAX__
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL)
-#else
-/* Otherwise, rely on two's complement. */
-#define PY_ULLONG_MAX (~0ULL)
-#define PY_LLONG_MAX  ((long long)(PY_ULLONG_MAX>>1))
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#endif /* LLONG_MAX */
-#endif
-#endif /* HAVE_LONG_LONG */
-
-/* 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
-#define PY_SIZE_MAX SIZE_MAX
-#else
-#define PY_SIZE_MAX ((size_t)-1)
 #endif
 
-/* CPython needs this for the c-extension datetime, which is pure python on PyPy 
-   downstream packages assume it is here (Pandas for instance) */
-#include  
+#define PY_UINT32_T uint32_t
+#define PY_UINT64_T uint64_t
+
+/* Signed variants of the above */
+#define PY_INT32_T int32_t
+#define PY_INT64_T int64_t
+
 
 /* uintptr_t is the C9X name for an unsigned integral type such that a
  * legitimate void* can be cast to uintptr_t and then back to void* again
  * 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;
+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_hash_t is the same size as a pointer. */
 #define SIZEOF_PY_HASH_T SIZEOF_SIZE_T
@@ -75,17 +41,19 @@
 #define SIZEOF_PY_UHASH_T SIZEOF_SIZE_T
 typedef size_t Py_uhash_t;
 
+/* Largest possible value of size_t. */
+#define PY_SIZE_MAX SIZE_MAX
+
+/* Largest positive value of type Py_ssize_t. */
+#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
+/* Smallest negative value of type Py_ssize_t. */
+#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
+
 #include 
 
-#ifdef __va_copy
-#define Py_VA_COPY __va_copy
-#else
-#ifdef VA_LIST_IS_ARRAY
-#define Py_VA_COPY(x, y) Py_MEMCPY((x), (y), sizeof(va_list))
-#else
-#define Py_VA_COPY(x, y) (x) = (y)
-#endif
-#endif
+/* CPython needs this for the c-extension datetime, which is pure python on PyPy
+   downstream packages assume it is here (Pandas for instance) */
+#include 
 
 /*******************************
  * stat() and fstat() fiddling *
@@ -132,8 +100,7 @@
  * Hide GCC attributes from compilers that don't support them.
  */
 #if (!defined(__GNUC__) || __GNUC__ < 2 || \
-     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) && \
-    !defined(RISCOS)
+     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) )
 #define Py_GCC_ATTRIBUTE(x)
 #else
 #define Py_GCC_ATTRIBUTE(x) __attribute__(x)
@@ -148,10 +115,13 @@
 #define Py_ALIGNED(x)
 #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.
+/* Eliminate end-of-loop code not reached warnings from SunPro C
+ * when using do{...}while(0) macros
  */
+#ifdef __SUNPRO_C
+#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
+#endif
+
 #ifndef Py_LL
 #define Py_LL(x) x##LL
 #endif
@@ -160,4 +130,7 @@
 #define Py_ULL(x) Py_LL(x##U)
 #endif
 
+#define Py_VA_COPY va_copy
+
+
 #endif /* Py_PYPORT_H */
diff --git a/pypy/module/cpyext/parse/cpyext_object.h b/pypy/module/cpyext/parse/cpyext_object.h
--- a/pypy/module/cpyext/parse/cpyext_object.h
+++ b/pypy/module/cpyext/parse/cpyext_object.h
@@ -1,6 +1,6 @@
 #pragma once
 
-typedef long Py_ssize_t;
+typedef long Py_ssize_t;  /* CPython defines it in pyport.h */
 
 #define PyObject_HEAD  \
     Py_ssize_t ob_refcnt;        \
diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -448,6 +448,10 @@
     def get_empty_storage(self):
         raise NotImplementedError
 
+    def setitem_str(self, w_dict, key, w_value):
+        w_dict.setitem(self.space.newtext(key), w_value)
+
+
     @jit.look_inside_iff(lambda self, w_dict:
                          w_dict_unrolling_heuristic(w_dict))
     def w_keys(self, w_dict):
diff --git a/pypy/objspace/std/jsondict.py b/pypy/objspace/std/jsondict.py
--- a/pypy/objspace/std/jsondict.py
+++ b/pypy/objspace/std/jsondict.py
@@ -89,6 +89,10 @@
         self.switch_to_unicode_strategy(w_dict)
         w_dict.setitem(w_key, w_value)
 
+    # for setitem_str use the default implementation
+    # because the jsonmap needs a wrapped key anyway
+
+
     def setdefault(self, w_dict, w_key, w_default):
         if self.is_correct_type(w_key):
             w_result = self.getitem_unicode(w_dict, w_key)
diff --git a/pypy/objspace/std/test/test_jsondict.py b/pypy/objspace/std/test/test_jsondict.py
--- a/pypy/objspace/std/test/test_jsondict.py
+++ b/pypy/objspace/std/test/test_jsondict.py
@@ -103,3 +103,16 @@
         str(d)
         repr(d)
 
+    def test_objdict_bug(self):
+        import _pypyjson
+        a = """{"foo": "bar"}"""
+        d = _pypyjson.loads(a)
+        d['foo'] = 'x'
+
+        class Obj(object):
+            pass
+
+        x = Obj()
+        x.__dict__ = d
+
+        x.foo = 'baz'  # used to segfault on pypy3
diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py
--- a/rpython/rlib/rbigint.py
+++ b/rpython/rlib/rbigint.py
@@ -1174,7 +1174,7 @@
     def lshift(self, int_other):
         if int_other < 0:
             raise ValueError("negative shift count")
-        elif int_other == 0:
+        elif int_other == 0 or self.sign == 0:
             return self
 
         # wordshift, remshift = divmod(int_other, SHIFT)
@@ -1183,8 +1183,6 @@
 
         if not remshift:
             # So we can avoid problems with eq, AND avoid the need for normalize.
-            if self.sign == 0:
-                return self
             return rbigint([NULLDIGIT] * wordshift + self._digits, self.sign, self.numdigits() + wordshift)
 
         oldsize = self.numdigits()
diff --git a/rpython/rlib/test/test_rbigint.py b/rpython/rlib/test/test_rbigint.py
--- a/rpython/rlib/test/test_rbigint.py
+++ b/rpython/rlib/test/test_rbigint.py
@@ -704,6 +704,10 @@
         # Chek value accuracy.
         assert rbigint.fromlong(18446744073709551615L).rshift(1).tolong() == 18446744073709551615L >> 1
 
+    def test_shift_optimization(self):
+        # does not crash with memory error
+        assert rbigint.fromint(0).lshift(sys.maxint).tolong() == 0
+
     def test_qshift(self):
         for x in range(10):
             for y in range(1, 161, 16):

From pypy.commits at gmail.com  Tue Jan 14 07:23:03 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Tue, 14 Jan 2020 04:23:03 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: make num >> (huge int) return 0 or -1
Message-ID: <5e1db2a7.1c69fb81.bbf20.19fe@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98529:0d41cb5cfe59
Date: 2020-01-14 13:21 +0100
http://bitbucket.org/pypy/pypy/changeset/0d41cb5cfe59/

Log:	make num >> (huge int) return 0 or -1

diff --git a/pypy/objspace/std/longobject.py b/pypy/objspace/std/longobject.py
--- a/pypy/objspace/std/longobject.py
+++ b/pypy/objspace/std/longobject.py
@@ -325,7 +325,10 @@
             raise oefmt(space.w_ValueError, "negative shift count")
         try:
             shift = w_other.asbigint().toint()
-        except OverflowError:   # b too big # XXX maybe just return 0L instead?
+        except OverflowError:
+            if self.num.sign < 0:
+                return space.newint(-1)
+            return space.newint(0)
             raise oefmt(space.w_OverflowError, "shift count too large")
         return newlong(space, self.num.rshift(shift))
 
diff --git a/pypy/objspace/std/test/test_longobject.py b/pypy/objspace/std/test/test_longobject.py
--- a/pypy/objspace/std/test/test_longobject.py
+++ b/pypy/objspace/std/test/test_longobject.py
@@ -212,9 +212,13 @@
         raises(OverflowError, "long(1) << (2 ** 100)")
         raises(ValueError, "long(1) >> long(-1)")
         raises(ValueError, "long(1) >> -1")
-        raises(OverflowError, "long(1) >> (2 ** 100)")
+        assert long(1) >> (2 ** 100) == 0
+        assert long(-1) >> (2 ** 100) == -1
+        assert 1 >> (2 ** 100) == 0 # int compatibility
+        assert -1 >> (2 ** 100) == -1 # int compatibility
         assert 0 << (1 << 1000) == 0
 
+
     def test_pow(self):
         long = self._long
         x = self._long(0)

From pypy.commits at gmail.com  Tue Jan 14 09:23:18 2020
From: pypy.commits at gmail.com (antocuni)
Date: Tue, 14 Jan 2020 06:23:18 -0800 (PST)
Subject: [pypy-commit] pypy hpy: hg merge py3.6
Message-ID: <5e1dced6.1c69fb81.6cc0b.1355@mx.google.com>

Author: Antonio Cuni 
Branch: hpy
Changeset: r98531:b47edb1d5c11
Date: 2020-01-14 15:22 +0100
http://bitbucket.org/pypy/pypy/changeset/b47edb1d5c11/

Log:	hg merge py3.6

diff too long, truncating to 2000 out of 122344 lines

diff --git a/extra_tests/cffi_tests/cffi0/backend_tests.py b/extra_tests/cffi_tests/cffi0/backend_tests.py
--- a/extra_tests/cffi_tests/cffi0/backend_tests.py
+++ b/extra_tests/cffi_tests/cffi0/backend_tests.py
@@ -1242,7 +1242,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1261,7 +1261,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi0/test_ownlib.py b/extra_tests/cffi_tests/cffi0/test_ownlib.py
--- a/extra_tests/cffi_tests/cffi0/test_ownlib.py
+++ b/extra_tests/cffi_tests/cffi0/test_ownlib.py
@@ -372,3 +372,29 @@
         assert s.top == 22
         assert s.right == 33
         assert s.bottom == 44
+
+    def test_dlopen_handle(self):
+        if self.module is None:
+            py.test.skip("fix the auto-generation of the tiny test lib")
+        if sys.platform == 'win32':
+            py.test.skip("uses 'dl' explicitly")
+        if self.__class__.Backend is CTypesBackend:
+            py.test.skip("not for the ctypes backend")
+        backend = self.Backend()
+        ffi1 = FFI(backend=backend)
+        ffi1.cdef("""void *dlopen(const char *filename, int flags);
+                     int dlclose(void *handle);""")
+        lib1 = ffi1.dlopen('dl')
+        handle = lib1.dlopen(self.module.encode(sys.getfilesystemencoding()),
+                             backend.RTLD_LAZY)
+        assert ffi1.typeof(handle) == ffi1.typeof("void *")
+        assert handle
+
+        ffi = FFI(backend=backend)
+        ffi.cdef("""unsigned short foo_2bytes(unsigned short a);""")
+        lib = ffi.dlopen(handle)
+        x = lib.foo_2bytes(1000)
+        assert x == 1042
+
+        err = lib1.dlclose(handle)
+        assert err == 0
diff --git a/extra_tests/cffi_tests/cffi0/test_zdistutils.py b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
--- a/extra_tests/cffi_tests/cffi0/test_zdistutils.py
+++ b/extra_tests/cffi_tests/cffi0/test_zdistutils.py
@@ -90,7 +90,7 @@
         csrc = '/*hi there %s!2*/\n#include \n' % self
         v = Verifier(ffi, csrc, force_generic_engine=self.generic,
                      libraries=[self.lib_m])
-        basename = self.__class__.__name__ + 'test_compile_module'
+        basename = self.__class__.__name__[:10] + '_test_compile_module'
         v.modulefilename = filename = str(udir.join(basename + '.so'))
         v.compile_module()
         assert filename == v.modulefilename
diff --git a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
--- a/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
+++ b/extra_tests/cffi_tests/cffi1/test_new_ffi_1.py
@@ -1221,7 +1221,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
@@ -1239,7 +1239,7 @@
             py.test.skip(str(e))
         f.write(ffi.buffer(a, 1000 * ffi.sizeof("int")))
         f.seek(0)
-        assert f.read() == array.array('i', range(1000)).tostring()
+        assert f.read() == arraytostring(array.array('i', range(1000)))
         f.seek(0)
         b = ffi.new("int[]", 1005)
         f.readinto(ffi.buffer(b, 1000 * ffi.sizeof("int")))
diff --git a/extra_tests/cffi_tests/cffi1/test_re_python.py b/extra_tests/cffi_tests/cffi1/test_re_python.py
--- a/extra_tests/cffi_tests/cffi1/test_re_python.py
+++ b/extra_tests/cffi_tests/cffi1/test_re_python.py
@@ -261,3 +261,24 @@
     # based on issue #429
     from re_python_pysrc import ffi
     ffi.new("selfref_ptr_t")
+
+def test_dlopen_handle():
+    import _cffi_backend
+    from re_python_pysrc import ffi
+    if sys.platform == 'win32':
+        py.test.skip("uses 'dl' explicitly")
+    ffi1 = FFI()
+    ffi1.cdef("""void *dlopen(const char *filename, int flags);
+                 int dlclose(void *handle);""")
+    lib1 = ffi1.dlopen('dl')
+    handle = lib1.dlopen(extmod.encode(sys.getfilesystemencoding()),
+                         _cffi_backend.RTLD_LAZY)
+    assert ffi1.typeof(handle) == ffi1.typeof("void *")
+    assert handle
+
+    lib = ffi.dlopen(handle)
+    assert lib.add42(-10) == 32
+    assert type(lib.add42) is _cffi_backend.FFI.CData
+
+    err = lib1.dlclose(handle)
+    assert err == 0
diff --git a/extra_tests/cffi_tests/cffi1/test_recompiler.py b/extra_tests/cffi_tests/cffi1/test_recompiler.py
--- a/extra_tests/cffi_tests/cffi1/test_recompiler.py
+++ b/extra_tests/cffi_tests/cffi1/test_recompiler.py
@@ -27,13 +27,14 @@
 
 def verify(ffi, module_name, source, *args, **kwds):
     no_cpp = kwds.pop('no_cpp', False)
+    ignore_warnings = kwds.pop('ignore_warnings', False)
     kwds.setdefault('undef_macros', ['NDEBUG'])
     module_name = '_CFFI_' + module_name
     ffi.set_source(module_name, source)
     if not os.environ.get('NO_CPP') and not no_cpp:   # test the .cpp mode too
         kwds.setdefault('source_extension', '.cpp')
         source = 'extern "C" {\n%s\n}' % (source,)
-    elif sys.platform != 'win32':
+    elif sys.platform != 'win32' and not ignore_warnings:
         # add '-Werror' to the existing 'extra_compile_args' flags
         from extra_tests.cffi_tests.support import extra_compile_args
         kwds['extra_compile_args'] = (kwds.get('extra_compile_args', []) +
@@ -137,7 +138,8 @@
     import math
     ffi = FFI()
     ffi.cdef("float sin(double); double cos(double);")
-    lib = verify(ffi, 'test_math_sin', '#include ')
+    lib = verify(ffi, 'test_math_sin', '#include ',
+                 ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_repr_lib():
@@ -349,9 +351,9 @@
     lib = verify(ffi, 'test_verify_exact_field_offset',
                  """struct foo_s { short a; int b; };""")
     e = py.test.raises(ffi.error, ffi.new, "struct foo_s *", [])    # lazily
-    assert str(e.value) == ("struct foo_s: wrong offset for field 'b' (cdef "
-                       'says 0, but C compiler says 4). fix it or use "...;" '
-                       "in the cdef for struct foo_s to make it flexible")
+    assert str(e.value).startswith(
+        "struct foo_s: wrong offset for field 'b' (cdef "
+        'says 0, but C compiler says 4). fix it or use "...;" ')
 
 def test_type_caching():
     ffi1 = FFI(); ffi1.cdef("struct foo_s;")
@@ -646,7 +648,7 @@
     ffi.cdef("sshort_t ff3(sshort_t);")
     lib = verify(ffi, "test_include_3",
                  "typedef short sshort_t; //usually from a #include\n"
-                 "sshort_t ff3(sshort_t x) { return x + 42; }")
+                 "sshort_t ff3(sshort_t x) { return (sshort_t)(x + 42); }")
     assert lib.ff3(10) == 52
     assert ffi.typeof(ffi.cast("sshort_t", 42)) is ffi.typeof("short")
     assert ffi1.typeof("sshort_t") is ffi.typeof("sshort_t")
@@ -755,7 +757,7 @@
     ffi = FFI()
     ffi.cdef(unicode("float sin(double); double cos(double);"))
     lib = verify(ffi, 'test_math_sin_unicode', unicode('#include '),
-                 libraries=[unicode(lib_m)])
+                 libraries=[unicode(lib_m)], ignore_warnings=True)
     assert lib.cos(1.43) == math.cos(1.43)
 
 def test_incomplete_struct_as_arg():
@@ -883,15 +885,20 @@
     e5 = py.test.raises(TypeError, lib.foo2)
     e6 = py.test.raises(TypeError, lib.foo2, 42)
     e7 = py.test.raises(TypeError, lib.foo2, 45, 46, 47)
-    assert str(e1.value) == "foo0() takes no arguments (1 given)"
-    assert str(e2.value) == "foo0() takes no arguments (2 given)"
-    assert str(e3.value) == "foo1() takes exactly one argument (0 given)"
-    assert str(e4.value) == "foo1() takes exactly one argument (2 given)"
-    assert str(e5.value) in ["foo2 expected 2 arguments, got 0",
+    def st1(s):
+        s = str(s)
+        if s.startswith("_CFFI_test_unpack_args.CompiledLib."):
+            s = s[len("_CFFI_test_unpack_args.CompiledLib."):]
+        return s
+    assert st1(e1.value) == "foo0() takes no arguments (1 given)"
+    assert st1(e2.value) == "foo0() takes no arguments (2 given)"
+    assert st1(e3.value) == "foo1() takes exactly one argument (0 given)"
+    assert st1(e4.value) == "foo1() takes exactly one argument (2 given)"
+    assert st1(e5.value) in ["foo2 expected 2 arguments, got 0",
                              "foo2() takes exactly 2 arguments (0 given)"]
-    assert str(e6.value) in ["foo2 expected 2 arguments, got 1",
+    assert st1(e6.value) in ["foo2 expected 2 arguments, got 1",
                              "foo2() takes exactly 2 arguments (1 given)"]
-    assert str(e7.value) in ["foo2 expected 2 arguments, got 3",
+    assert st1(e7.value) in ["foo2 expected 2 arguments, got 3",
                              "foo2() takes exactly 2 arguments (3 given)"]
 
 def test_address_of_function():
@@ -899,7 +906,7 @@
     ffi.cdef("long myfunc(long x);")
     lib = verify(ffi, "test_addressof_function", """
         char myfunc(char x) { return (char)(x + 42); }
-    """)
+    """, ignore_warnings=True)
     assert lib.myfunc(5) == 47
     assert lib.myfunc(0xABC05) == 47
     assert not isinstance(lib.myfunc, ffi.CData)
@@ -1172,7 +1179,7 @@
     lib = verify(ffi, 'test_some_float_invalid_3', """
         typedef long double foo_t;
         foo_t neg(foo_t x) { return -x; }
-    """)
+    """, ignore_warnings=True)
     if ffi.sizeof("long double") == ffi.sizeof("double"):
         assert lib.neg(12.3) == -12.3
     else:
@@ -1846,7 +1853,7 @@
     ffi = FFI()
     ffi.cdef("float f1(double);")
     lib = verify(ffi, 'test_introspect_function', """
-        float f1(double x) { return x; }
+        float f1(double x) { return (float)x; }
     """)
     assert dir(lib) == ['f1']
     FUNC = ffi.typeof(lib.f1)
@@ -2151,7 +2158,8 @@
     lib = verify(ffi, "test_call_with_nested_anonymous_struct", """
         struct foo { int a; union { int b, c; }; };
         struct foo f(void) {
-            struct foo s = { 40 };
+            struct foo s;
+            s.a = 40;
             s.b = 200;
             return s;
         }
diff --git a/extra_tests/cffi_tests/support.py b/extra_tests/cffi_tests/support.py
--- a/extra_tests/cffi_tests/support.py
+++ b/extra_tests/cffi_tests/support.py
@@ -2,7 +2,7 @@
 import sys, os
 
 if sys.version_info < (3,):
-    __all__ = ['u']
+    __all__ = ['u', 'arraytostring']
 
     class U(object):
         def __add__(self, other):
@@ -13,12 +13,16 @@
     assert u+'a\x00b' == eval(r"u'a\x00b'")
     assert u+'a\u1234b' == eval(r"u'a\u1234b'")
     assert u+'a\U00012345b' == eval(r"u'a\U00012345b'")
+    def arraytostring(a):
+        return a.tostring()
 
 else:
-    __all__ = ['u', 'unicode', 'long']
+    __all__ = ['u', 'unicode', 'long', 'arraytostring']
     u = ""
     unicode = str
     long = int
+    def arraytostring(a):
+        return a.tobytes()
 
 
 class StdErrCapture(object):
diff --git a/extra_tests/test_sqlite3.py b/extra_tests/test_sqlite3.py
--- a/extra_tests/test_sqlite3.py
+++ b/extra_tests/test_sqlite3.py
@@ -88,8 +88,7 @@
     with pytest.raises(StopIteration):
         next(cur)
 
-    with pytest.raises(_sqlite3.ProgrammingError):
-        cur.executemany('select 1', [])
+    cur.executemany('select 1', [])
     with pytest.raises(StopIteration):
         next(cur)
 
@@ -201,8 +200,8 @@
 
 def test_explicit_begin(con):
     con.execute('BEGIN')
-    con.execute('BEGIN ')
-    con.execute('BEGIN')
+    with pytest.raises(_sqlite3.OperationalError):
+        con.execute('BEGIN ')
     con.commit()
     con.execute('BEGIN')
     con.commit()
@@ -212,7 +211,6 @@
     con.execute('select 1')
 
 def test_returning_blob_must_own_memory(con):
-    import gc
     con.create_function("returnblob", 0, lambda: memoryview(b"blob"))
     cur = con.execute("select returnblob()")
     val = cur.fetchone()[0]
@@ -228,15 +226,15 @@
     cur = con.cursor()
     cur.execute("create table test(a)")
     cur.executemany("insert into test values (?)", [[1], [2], [3]])
-    assert cur.lastrowid is None
+    assert cur.lastrowid == 0
     # issue 2682
     cur.execute('''insert
                 into test
                 values (?)
                 ''', (1, ))
-    assert cur.lastrowid is not None
+    assert cur.lastrowid
     cur.execute('''insert\t into test values (?) ''', (1, ))
-    assert cur.lastrowid is not None
+    assert cur.lastrowid
 
 def test_authorizer_bad_value(con):
     def authorizer_cb(action, arg1, arg2, dbname, source):
@@ -312,3 +310,24 @@
     gc.collect()
     gc.collect()
     assert SQLiteBackend.success
+
+def test_locked_table(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    cur = con.execute("SELECT * FROM foo")  # foo() is locked while cur is active
+    with pytest.raises(_sqlite3.OperationalError):
+        con.execute("DROP TABLE foo")
+
+def test_cursor_close(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    cur = con.execute("SELECT * FROM foo")
+    cur.close()
+    con.execute("DROP TABLE foo")  # no error
+
+def test_cursor_del(con):
+    con.execute("CREATE TABLE foo(x)")
+    con.execute("INSERT INTO foo(x) VALUES (?)", [42])
+    con.execute("SELECT * FROM foo")
+    import gc; gc.collect()
+    con.execute("DROP TABLE foo")  # no error
diff --git a/lib-python/3/sqlite3/test/regression.py b/lib-python/3/sqlite3/test/regression.py
--- a/lib-python/3/sqlite3/test/regression.py
+++ b/lib-python/3/sqlite3/test/regression.py
@@ -127,6 +127,7 @@
         con.execute("create table foo(bar timestamp)")
         con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
         con.execute(SELECT)
+        support.gc_collect()  # PyPy change
         con.execute("drop table foo")
         con.execute("create table foo(bar integer)")
         con.execute("insert into foo(bar) values (5)")
diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py
--- a/lib_pypy/_curses_build.py
+++ b/lib_pypy/_curses_build.py
@@ -6,9 +6,7 @@
     static const int NCURSES_VERSION_MINOR;
 '''
 
-version = (0, 0)
 def find_library(options):
-    global version
     for library in options:
         ffi = FFI()
         ffi.cdef(version_str)
@@ -17,7 +15,6 @@
             ffi.compile()
             import _curses_cffi_check
             lib = _curses_cffi_check.lib
-            version = (lib.NCURSES_VERSION_MAJOR, lib.NCURSES_VERSION_MINOR)
         except VerificationError as e:
             e_last = e
             continue
@@ -385,7 +382,7 @@
 void _m_getsyx(int *yx);
 """)
 
-if version > (5, 7):
+if 'ncursesw' in libs:
     ffi.cdef("""
 typedef int... wint_t;
 int wget_wch(WINDOW *, wint_t *);
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -233,7 +233,6 @@
         self.text_factory = _unicode_text_factory
 
         self._detect_types = detect_types
-        self._in_transaction = False
         self.isolation_level = isolation_level
 
         self.__cursors = []
@@ -433,7 +432,7 @@
 
     def _begin(self):
         statement_star = _ffi.new('sqlite3_stmt **')
-        ret = _lib.sqlite3_prepare_v2(self._db, self.__begin_statement, -1,
+        ret = _lib.sqlite3_prepare_v2(self._db, self._begin_statement, -1,
                                       statement_star, _ffi.NULL)
         try:
             if ret != _lib.SQLITE_OK:
@@ -441,14 +440,13 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = True
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
     def commit(self):
         self._check_thread()
         self._check_closed()
-        if not self._in_transaction:
+        if not self.in_transaction:
             return
 
         # PyPy fix for non-refcounting semantics: since 2.7.13 (and in
@@ -473,14 +471,13 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = False
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
     def rollback(self):
         self._check_thread()
         self._check_closed()
-        if not self._in_transaction:
+        if not self.in_transaction:
             return
 
         self.__do_all_statements(Statement._reset, True)
@@ -494,7 +491,6 @@
             ret = _lib.sqlite3_step(statement_star[0])
             if ret != _lib.SQLITE_DONE:
                 raise self._get_exception(ret)
-            self._in_transaction = False
         finally:
             _lib.sqlite3_finalize(statement_star[0])
 
@@ -687,10 +683,10 @@
                 self.__func_cache[callable] = trace_callback
         _lib.sqlite3_trace(self._db, trace_callback, _ffi.NULL)
 
-    if sys.version_info[0] >= 3:
-        def __get_in_transaction(self):
-            return self._in_transaction
-        in_transaction = property(__get_in_transaction)
+    @property
+    @_check_closed_wrap
+    def in_transaction(self):
+        return not _lib.sqlite3_get_autocommit(self._db)
 
     def __get_total_changes(self):
         self._check_closed()
@@ -710,7 +706,7 @@
             stmt = str("BEGIN " + val).upper()
             if stmt not in BEGIN_STATMENTS:
                 raise ValueError("invalid value for isolation_level")
-            self.__begin_statement = stmt.encode('utf-8')
+            self._begin_statement = stmt.encode('utf-8')
         self._isolation_level = val
     isolation_level = property(__get_isolation_level, __set_isolation_level)
 
@@ -745,6 +741,11 @@
 
         self.__initialized = True
 
+    def __del__(self):
+        # Since statements are cached, they can outlive their parent cursor
+        if self.__statement:
+            self.__statement._reset()
+
     def close(self):
         if not self.__initialized:
             raise ProgrammingError("Base Cursor.__init__ not called.")
@@ -876,24 +877,13 @@
             except AttributeError:
                 pass
             self.__rowcount = -1
+            if self.__statement:
+                self.__statement._reset()
             self.__statement = self.__connection._statement_cache.get(sql)
 
-            if self.__connection._isolation_level is not None:
-                if self.__statement._type in (
-                    _STMT_TYPE_UPDATE,
-                    _STMT_TYPE_DELETE,
-                    _STMT_TYPE_INSERT,
-                    _STMT_TYPE_REPLACE
-                ):
-                    if not self.__connection._in_transaction:
-                        self.__connection._begin()
-                elif self.__statement._type == _STMT_TYPE_OTHER:
-                    if self.__connection._in_transaction:
-                        self.__connection.commit()
-                elif self.__statement._type == _STMT_TYPE_SELECT:
-                    if multiple:
-                        raise ProgrammingError("You cannot execute SELECT "
-                                               "statements in executemany().")
+            if self.__connection._begin_statement and self.__statement._is_dml:
+                if _lib.sqlite3_get_autocommit(self.__connection._db):
+                    self.__connection._begin()
 
             for params in many_params:
                 self.__statement._set_params(params)
@@ -911,6 +901,16 @@
                     self.__connection._reset_already_committed_statements()
                     ret = _lib.sqlite3_step(self.__statement._statement)
 
+                if self.__statement._is_dml:
+                    if self.__rowcount == -1:
+                        self.__rowcount = 0
+                    self.__rowcount += _lib.sqlite3_changes(self.__connection._db)
+                else:
+                    self.__rowcount = -1
+
+                if not multiple:
+                    self.__lastrowid = _lib.sqlite3_last_insert_rowid(self.__connection._db)
+
                 if ret == _lib.SQLITE_ROW:
                     if multiple:
                         raise ProgrammingError("executemany() can only execute DML statements.")
@@ -923,28 +923,9 @@
                     self.__statement._reset()
                     raise self.__connection._get_exception(ret)
 
-                if self.__statement._type in (
-                    _STMT_TYPE_UPDATE,
-                    _STMT_TYPE_DELETE,
-                    _STMT_TYPE_INSERT,
-                    _STMT_TYPE_REPLACE
-                ):
-                    if self.__rowcount == -1:
-                        self.__rowcount = 0
-                    self.__rowcount += _lib.sqlite3_changes(self.__connection._db)
-
-                if not multiple and self.__statement._type in (
-                        # REPLACE is an alias for INSERT OR REPLACE
-                        _STMT_TYPE_INSERT, _STMT_TYPE_REPLACE):
-                    self.__lastrowid = _lib.sqlite3_last_insert_rowid(self.__connection._db)
-                else:
-                    self.__lastrowid = None
-
                 if multiple:
                     self.__statement._reset()
         finally:
-            self.__connection._in_transaction = \
-                not _lib.sqlite3_get_autocommit(self.__connection._db)
             self.__locked = False
         return self
 
@@ -1086,38 +1067,19 @@
         if '\0' in sql:
             raise ValueError("the query contains a null character")
 
-        
-        if sql:
-            first_word = sql.lstrip().split()[0].upper()
-            if first_word == '':
-                self._type = _STMT_TYPE_INVALID
-            if first_word == "SELECT":
-                self._type = _STMT_TYPE_SELECT
-            elif first_word == "INSERT":
-                self._type = _STMT_TYPE_INSERT
-            elif first_word == "UPDATE":
-                self._type = _STMT_TYPE_UPDATE
-            elif first_word == "DELETE":
-                self._type = _STMT_TYPE_DELETE
-            elif first_word == "REPLACE":
-                self._type = _STMT_TYPE_REPLACE
-            else:
-                self._type = _STMT_TYPE_OTHER
-        else:
-            self._type = _STMT_TYPE_INVALID
+        to_check = sql.lstrip().upper()
+        self._valid = bool(to_check)
+        self._is_dml = to_check.startswith(('INSERT', 'UPDATE', 'DELETE', 'REPLACE'))
 
-        if isinstance(sql, unicode):
-            sql = sql.encode('utf-8')
         statement_star = _ffi.new('sqlite3_stmt **')
         next_char = _ffi.new('char **')
-        c_sql = _ffi.new("char[]", sql)
+        c_sql = _ffi.new("char[]", sql.encode('utf-8'))
         ret = _lib.sqlite3_prepare_v2(self.__con._db, c_sql, -1,
                                       statement_star, next_char)
         self._statement = statement_star[0]
 
         if ret == _lib.SQLITE_OK and not self._statement:
             # an empty statement, work around that, as it's the least trouble
-            self._type = _STMT_TYPE_SELECT
             c_sql = _ffi.new("char[]", b"select 42")
             ret = _lib.sqlite3_prepare_v2(self.__con._db, c_sql, -1,
                                           statement_star, next_char)
@@ -1238,12 +1200,7 @@
             raise ValueError("parameters are of unsupported type")
 
     def _get_description(self):
-        if self._type in (
-            _STMT_TYPE_INSERT,
-            _STMT_TYPE_UPDATE,
-            _STMT_TYPE_DELETE,
-            _STMT_TYPE_REPLACE
-        ):
+        if self._is_dml:
             return None
         desc = []
         for i in xrange(_lib.sqlite3_column_count(self._statement)):
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -141,7 +141,11 @@
         linked to a particular library, just like C headers; in the
         library we only look for the actual (untyped) symbols.
         """
-        assert isinstance(name, basestring) or name is None
+        if not (isinstance(name, basestring) or
+                name is None or
+                isinstance(name, self.CData)):
+            raise TypeError("dlopen(name): name must be a file name, None, "
+                            "or an already-opened 'void *' handle")
         with self._lock:
             lib, function_cache = _make_ffi_library(self, name, flags)
             self._function_caches.append(function_cache)
@@ -799,9 +803,9 @@
 
 def _load_backend_lib(backend, name, flags):
     import os
-    if name is None:
-        if sys.platform != "win32":
-            return backend.load_library(None, flags)
+    if not isinstance(name, basestring):
+        if sys.platform != "win32" or name is not None:
+            return backend.load_library(name, flags)
         name = "c"    # Windows: load_library(None) fails, but this works
                       # on Python 2 (backward compatibility hack only)
     first_error = None
@@ -935,7 +939,7 @@
             backendlib.close_lib()
             self.__dict__.clear()
     #
-    if libname is not None:
+    if isinstance(libname, basestring):
         try:
             if not isinstance(libname, str):    # unicode, on Python 2
                 libname = libname.encode('utf-8')
diff --git a/lib_pypy/cffi/recompiler.py b/lib_pypy/cffi/recompiler.py
--- a/lib_pypy/cffi/recompiler.py
+++ b/lib_pypy/cffi/recompiler.py
@@ -1216,7 +1216,8 @@
             size_of_result = '(int)sizeof(%s)' % (
                 tp.result.get_c_name('', context),)
         prnt('static struct _cffi_externpy_s _cffi_externpy__%s =' % name)
-        prnt('  { "%s.%s", %s };' % (self.module_name, name, size_of_result))
+        prnt('  { "%s.%s", %s, 0, 0 };' % (
+            self.module_name, name, size_of_result))
         prnt()
         #
         arguments = []
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -8,3 +8,7 @@
 .. branch: cpyext-speedup-tests-py36
 
 Make cpyext test faster, especially on py3.6
+
+.. branch: py3.6-sqlite
+
+Follow CPython's behaviour more closely in sqlite3
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -394,8 +394,10 @@
         return l
 
     def _visit_defaults(self, defaults):
+        assert len(defaults) > 0
         w_tup = self._tuple_of_consts(defaults)
         if w_tup:
+            self.update_position(defaults[-1].lineno, True)
             self.load_const(w_tup)
         else:
             self.visit_sequence(defaults)
diff --git a/pypy/interpreter/astcompiler/test/test_astbuilder.py b/pypy/interpreter/astcompiler/test/test_astbuilder.py
--- a/pypy/interpreter/astcompiler/test/test_astbuilder.py
+++ b/pypy/interpreter/astcompiler/test/test_astbuilder.py
@@ -663,7 +663,7 @@
         assert exc_list.msg == "only single target (not list) can be annotated"
 
         exc_bad_target = pytest.raises(SyntaxError, self.get_ast, '{}: int').value
-        assert exc_bad_target.msg == "illegal target for annoation"
+        assert exc_bad_target.msg == "illegal target for annotation"
 
 
     def test_augassign(self):
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1255,6 +1255,27 @@
         src = """# -*- coding: utf-8 -*-\nz=ord(fr'\xc3\x98')\n"""
         yield self.st, src, 'z', 0xd8
 
+    def test_func_defaults_lineno(self):
+        # like CPython 3.6.9 (at least), check that '''def f(
+        #            x = 5,
+        #            y = 6,
+        #            ):'''
+        # generates the tuple (5, 6) as a constant for the defaults,
+        # but with the lineno for the last item (here the 6).  There
+        # is no lineno for the other items, of course, because the
+        # complete tuple is loaded with just one LOAD_CONST.
+        yield self.simple_test, """\
+            def fdl():      # line 1
+                def f(      # line 2
+                    x = 5,  # line 3
+                    y = 6   # line 4
+                    ):      # line 5
+                    pass    # line 6
+            import dis
+            co = fdl.__code__
+            x = [y for (x, y) in dis.findlinestarts(co)]
+        """, 'x', [4]
+
 
 class TestCompilerRevDB(BaseTestCompiler):
     spaceconfig = {"translation.reverse_debugger": True}
diff --git a/pypy/interpreter/test/test_nestedscope.py b/pypy/interpreter/test/apptest_nestedscope.py
rename from pypy/interpreter/test/test_nestedscope.py
rename to pypy/interpreter/test/apptest_nestedscope.py
--- a/pypy/interpreter/test/test_nestedscope.py
+++ b/pypy/interpreter/test/apptest_nestedscope.py
@@ -1,171 +1,169 @@
+from pytest import raises
 
+def test_nested_scope():
+    x = 42
+    def f(): return x
+    assert f() == 42
 
-class AppTestNestedScope:
+def test_nested_scope2():
+    x = 42
+    y = 3
+    def f(): return x
+    assert f() == 42
 
-    def test_nested_scope(self):
-        x = 42
-        def f(): return x
-        assert f() == 42
+def test_nested_scope3():
+    x = 42
+    def f():
+        def g():
+            return x
+        return g
+    assert f()() == 42
 
-    def test_nested_scope2(self):
-        x = 42
-        y = 3
-        def f(): return x
-        assert f() == 42
+def test_nested_scope4():
+    def f():
+        x = 3
+        def g():
+            return x
+        a = g()
+        x = 4
+        b = g()
+        return (a, b)
+    assert f() == (3, 4)
 
-    def test_nested_scope3(self):
-        x = 42
-        def f():
-            def g():
-                return x
-            return g
-        assert f()() == 42
+def test_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            i = x
+            return locals()
+        return g()
+    d = f()
+    assert d == {'i':3, 'x':3}
 
-    def test_nested_scope4(self):
-        def f():
-            x = 3
-            def g():
-                return x
-            a = g()
-            x = 4
-            b = g()
-            return (a, b)
-        assert f() == (3, 4)
-
-    def test_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
+def test_deeply_nested_scope_locals():
+    def f():
+        x = 3
+        def g():
+            def h():
                 i = x
                 return locals()
-            return g()
-        d = f()
-        assert d == {'i':3, 'x':3}
+            return locals(), h()
+        return g()
+    outer_locals, inner_locals = f()
+    assert inner_locals == {'i':3, 'x':3}
+    keys = sorted(outer_locals.keys())
+    assert keys == ['h', 'x']
 
-    def test_deeply_nested_scope_locals(self):
-        def f():
-            x = 3
-            def g():
-                def h():
-                    i = x
-                    return locals()
-                return locals(), h()
-            return g()
-        outer_locals, inner_locals = f()
-        assert inner_locals == {'i':3, 'x':3}
-        keys = sorted(outer_locals.keys())
-        assert keys == ['h', 'x']
+def test_lambda_in_genexpr():
+    assert [x() for x in (lambda: x for x in range(10))] == list(range(10))
 
-    def test_lambda_in_genexpr(self):
-        assert [x() for x in (lambda: x for x in range(10))] == list(range(10))
+def test_cell_repr():
+    import re
+    from reprlib import repr as r # Don't shadow builtin repr
 
-    def test_cell_repr(self):
-        import re
-        from reprlib import repr as r # Don't shadow builtin repr
+    def get_cell():
+        x = 42
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+    assert re.match(r'', r(x))
 
-        def get_cell():
+    def get_cell():
+        if False:
             x = 42
-            def inner():
+        def inner():
+            return x
+        return inner
+    x = get_cell().__closure__[0]
+    assert re.match(r'', repr(x))
+
+def test_cell_contents():
+    def f(x):
+        def f(y):
+            return x + y
+        return f
+
+    g = f(10)
+    assert g.__closure__[0].cell_contents == 10
+
+def test_empty_cell_contents():
+
+    def f():
+        def f(y):
+            return x + y
+        return f
+        x = 1
+
+    g = f()
+    with raises(ValueError):
+        g.__closure__[0].cell_contents
+
+def test_compare_cells():
+    def f(n):
+        if n:
+            x = n
+        def f(y):
+            return x + y
+        return f
+
+    empty_cell_1 = f(0).__closure__[0]
+    empty_cell_2 = f(0).__closure__[0]
+    g1 = f(1).__closure__[0]
+    g2 = f(2).__closure__[0]
+    assert g1 < g2
+    assert g1 <= g2
+    assert g2 > g1
+    assert g2 >= g1
+    assert not g1 == g2
+    assert g1 != g2
+    #
+    assert empty_cell_1 == empty_cell_2
+    assert not empty_cell_1 != empty_cell_2
+    assert empty_cell_1 < g1
+
+def test_leaking_class_locals():
+    def f(x):
+        class X:
+            x = 12
+            def f(self):
                 return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
-        assert re.match(r'', r(x))
+            locals()
+        return X
+    assert f(1).x == 12
 
-        def get_cell():
-            if False:
-                x = 42
-            def inner():
-                return x
-            return inner
-        x = get_cell().__closure__[0]
-        assert re.match(r'', repr(x))
+def test_nested_scope_locals_mutating_cellvars():
+    def f():
+        x = 12
+        def m():
+            locals()
+            x
+            locals()
+            return x
+        return m
+    assert f()() == 12
 
-    def test_cell_contents(self):
-        def f(x):
-            def f(y):
-                return x + y
-            return f
 
-        g = f(10)
-        assert g.__closure__[0].cell_contents == 10
+def test_unbound_local_after_del():
+    """
+    # #4617: It is now legal to delete a cell variable.
+    # The following functions must obviously compile,
+    # and give the correct error when accessing the deleted name.
+    def errorInOuter():
+        y = 1
+        del y
+        print(y)
+        def inner():
+            return y
 
-    def test_empty_cell_contents(self):
+    def errorInInner():
+        def inner():
+            return y
+        y = 1
+        del y
+        inner()
 
-        def f():
-            def f(y):
-                return x + y
-            return f
-            x = 1
-
-        g = f()
-        with raises(ValueError):
-            g.__closure__[0].cell_contents
-
-    def test_compare_cells(self):
-        def f(n):
-            if n:
-                x = n
-            def f(y):
-                return x + y
-            return f
-
-        empty_cell_1 = f(0).__closure__[0]
-        empty_cell_2 = f(0).__closure__[0]
-        g1 = f(1).__closure__[0]
-        g2 = f(2).__closure__[0]
-        assert g1 < g2
-        assert g1 <= g2
-        assert g2 > g1
-        assert g2 >= g1
-        assert not g1 == g2
-        assert g1 != g2
-        #
-        assert empty_cell_1 == empty_cell_2
-        assert not empty_cell_1 != empty_cell_2
-        assert empty_cell_1 < g1
-
-    def test_leaking_class_locals(self):
-        def f(x):
-            class X:
-                x = 12
-                def f(self):
-                    return x
-                locals()
-            return X
-        assert f(1).x == 12
-
-    def test_nested_scope_locals_mutating_cellvars(self):
-        def f():
-            x = 12
-            def m():
-                locals()
-                x
-                locals()
-                return x
-            return m
-        assert f()() == 12
-
-
-    def test_unbound_local_after_del(self):
-        """
-        # #4617: It is now legal to delete a cell variable.
-        # The following functions must obviously compile,
-        # and give the correct error when accessing the deleted name.
-        def errorInOuter():
-            y = 1
-            del y
-            print(y)
-            def inner():
-                return y
-
-        def errorInInner():
-            def inner():
-                return y
-            y = 1
-            del y
-            inner()
-
-        raises(UnboundLocalError, "errorInOuter()")
-        raises(NameError, "errorInInner()")
-        """
+    raises(UnboundLocalError, "errorInOuter()")
+    raises(NameError, "errorInInner()")
+    """
diff --git a/pypy/interpreter/test/test_class.py b/pypy/interpreter/test/test_class.py
--- a/pypy/interpreter/test/test_class.py
+++ b/pypy/interpreter/test/test_class.py
@@ -140,3 +140,9 @@
             "metaclass found to be 'function', but calling  "
             "with args ('Foo', (.foo_func at ")
+
+        with raises(TypeError) as exc:
+            class Foo(object, object):
+                pass
+        assert str(exc.value).startswith(
+            "duplicate base class 'object'")
diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -202,6 +202,19 @@
     return BaseObjSpace.exception_getclass(space, w_obj)
 
 def exception_issubclass_w(space, w_cls1, w_cls2):
+    if (space.type(w_cls1) is space.w_type and
+        space.type(w_cls2) is space.w_type):
+        return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
+    #
+    if (not exception_is_valid_class_w(space, w_cls2) or
+        not exception_is_valid_class_w(space, w_cls1)):
+        return False
+    #
+    # The rest is the rare slow case.  Use the general logic of issubclass()
+    # (issue #3149).  CPython 3.x doesn't do that (but there is a
+    # many-years issue report: https://bugs.python.org/issue12029), and
+    # there are probably tests, so we won't call abstract_issubclass_w()
+    # either in PyPy3.
     return BaseObjSpace.exception_issubclass_w(space, w_cls1, w_cls2)
 
 # ____________________________________________________________
diff --git a/pypy/module/__builtin__/compiling.py b/pypy/module/__builtin__/compiling.py
--- a/pypy/module/__builtin__/compiling.py
+++ b/pypy/module/__builtin__/compiling.py
@@ -155,7 +155,8 @@
         # give a more comprehensible error message for TypeErrors
         if e.got_any_traceback():
             raise
-        if not e.match(space, space.w_TypeError):
+        if (not e.match(space, space.w_TypeError) or
+                space.is_w(w_meta, space.w_type)):
             raise
         raise oefmt(space.w_TypeError,
             "metaclass found to be '%N', but calling %R "
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -249,3 +249,25 @@
                 return False
 
         assert issubclass(42, M()) is False
+
+    def test_exception_match_does_not_call_subclasscheck(self):
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            raise ValueError
+        except ValueError:       # Python 3.x behaviour
+            pass
+
+    def test_exception_raising_does_not_call_subclasscheck(self):
+        # test skipped: unsure how to get a non-normalized exception
+        # from pure Python.
+        class Special(Exception):
+            class __metaclass__(type):
+                def __subclasscheck__(cls1, cls2):
+                    return True
+        try:
+            skip("non-normalized exception") #raise Special, ValueError()
+        except Special:
+            pass
diff --git a/pypy/module/_cffi_backend/cdlopen.py b/pypy/module/_cffi_backend/cdlopen.py
--- a/pypy/module/_cffi_backend/cdlopen.py
+++ b/pypy/module/_cffi_backend/cdlopen.py
@@ -15,10 +15,11 @@
 
     def __init__(self, ffi, w_filename, flags):
         space = ffi.space
-        fname, handle = misc.dlopen_w(space, w_filename, flags)
+        fname, handle, autoclose = misc.dlopen_w(space, w_filename, flags)
         W_LibObject.__init__(self, ffi, fname)
         self.libhandle = handle
-        self.register_finalizer(space)
+        if autoclose:
+            self.register_finalizer(space)
 
     def _finalize_(self):
         h = self.libhandle
diff --git a/pypy/module/_cffi_backend/libraryobj.py b/pypy/module/_cffi_backend/libraryobj.py
--- a/pypy/module/_cffi_backend/libraryobj.py
+++ b/pypy/module/_cffi_backend/libraryobj.py
@@ -18,8 +18,10 @@
 
     def __init__(self, space, w_filename, flags):
         self.space = space
-        self.name, self.handle = misc.dlopen_w(space, w_filename, flags)
-        self.register_finalizer(space)
+        self.name, self.handle, autoclose = (
+            misc.dlopen_w(space, w_filename, flags))
+        if autoclose:
+            self.register_finalizer(space)
 
     def _finalize_(self):
         h = self.handle
diff --git a/pypy/module/_cffi_backend/misc.py b/pypy/module/_cffi_backend/misc.py
--- a/pypy/module/_cffi_backend/misc.py
+++ b/pypy/module/_cffi_backend/misc.py
@@ -8,7 +8,7 @@
 from rpython.rlib.objectmodel import specialize, we_are_translated
 from rpython.rlib.rarithmetic import r_uint, r_ulonglong
 from rpython.rlib.unroll import unrolling_iterable
-from rpython.rlib.rdynload import dlopen, DLOpenError
+from rpython.rlib.rdynload import dlopen, DLOpenError, DLLHANDLE
 from rpython.rlib.nonconst import NonConstant
 from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
@@ -408,7 +408,26 @@
 # ____________________________________________________________
 
 def dlopen_w(space, w_filename, flags):
-    if WIN32 and space.isinstance_w(w_filename, space.w_unicode):
+    from pypy.module._cffi_backend.cdataobj import W_CData
+    from pypy.module._cffi_backend import ctypeptr
+
+    autoclose = True
+    if isinstance(w_filename, W_CData):
+        # 'flags' ignored in this case
+        w_ctype = w_filename.ctype
+        if (not isinstance(w_ctype, ctypeptr.W_CTypePointer) or
+            not w_ctype.is_void_ptr):
+            raise oefmt(space.w_TypeError,
+                    "dlopen() takes a file name or 'void *' handle, not '%s'",
+                    w_ctype.name)
+        handle = w_filename.unsafe_escaping_ptr()
+        if not handle:
+            raise oefmt(space.w_RuntimeError, "cannot call dlopen(NULL)")
+        fname = w_ctype.extra_repr(handle)
+        handle = rffi.cast(DLLHANDLE, handle)
+        autoclose = False
+        #
+    elif WIN32 and space.isinstance_w(w_filename, space.w_unicode):
         fname = space.text_w(space.repr(w_filename))
         utf8_name = space.utf8_w(w_filename)
         uni_len = space.len_w(w_filename)
@@ -429,4 +448,4 @@
                 handle = dlopen(ll_libname, flags)
             except DLOpenError as e:
                 raise wrap_dlopenerror(space, e, fname)
-    return fname, handle
+    return fname, handle, autoclose
diff --git a/pypy/module/_cffi_backend/newtype.py b/pypy/module/_cffi_backend/newtype.py
--- a/pypy/module/_cffi_backend/newtype.py
+++ b/pypy/module/_cffi_backend/newtype.py
@@ -308,8 +308,8 @@
             w_FFIError = get_ffi_error(w_ctype.space)
             raise oefmt(w_FFIError,
                     '%s: %s%s%s (cdef says %d, but C compiler says %d).'
-                    ' fix it or use "...;" in the cdef for %s to '
-                    'make it flexible',
+                    ' fix it or use "...;" as the last field in the '
+                    'cdef for %s to make it flexible',
                     w_ctype.name, msg1, msg2, msg3,
                     cdef_value, compiler_value, w_ctype.name)
         w_ctype._custom_field_pos = True
diff --git a/pypy/module/_cffi_backend/test/test_re_python.py b/pypy/module/_cffi_backend/test/test_re_python.py
--- a/pypy/module/_cffi_backend/test/test_re_python.py
+++ b/pypy/module/_cffi_backend/test/test_re_python.py
@@ -75,6 +75,9 @@
         typedef struct bar_s { int x; signed char a[]; } bar_t;
         enum foo_e { AA, BB, CC };
         typedef struct selfref { struct selfref *next; } *selfref_ptr_t;
+
+        void *dlopen(const char *filename, int flags);
+        int dlclose(void *handle);
         """)
         ffi.set_source('re_python_pysrc', None)
         ffi.emit_python_code(str(tmpdir.join('re_python_pysrc.py')))
@@ -96,6 +99,11 @@
             return fix_path
         """)
 
+        cls.w_dl_libpath = space.w_None
+        if sys.platform != 'win32':
+            import ctypes.util
+            cls.w_dl_libpath = space.wrap(ctypes.util.find_library('dl'))
+
     def teardown_method(self, meth):
         self.space.appexec([], """():
             import sys
@@ -245,3 +253,22 @@
         self.fix_path()
         from re_python_pysrc import ffi
         ffi.new("selfref_ptr_t")
+
+    def test_dlopen_handle(self):
+        import _cffi_backend, sys
+        self.fix_path()
+        from re_python_pysrc import ffi
+        if self.dl_libpath is None:
+            py.test.skip("uses 'dl' explicitly")
+        lib1 = ffi.dlopen(self.dl_libpath)
+        handle = lib1.dlopen(self.extmod.encode(sys.getfilesystemencoding()),
+                             _cffi_backend.RTLD_LAZY)
+        assert ffi.typeof(handle) == ffi.typeof("void *")
+        assert handle
+
+        lib = ffi.dlopen(handle)
+        assert lib.add42(-10) == 32
+        assert type(lib.add42) is _cffi_backend.FFI.CData
+
+        err = lib1.dlclose(handle)
+        assert err == 0
diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py b/pypy/module/_cffi_backend/test/test_recompiler.py
--- a/pypy/module/_cffi_backend/test/test_recompiler.py
+++ b/pypy/module/_cffi_backend/test/test_recompiler.py
@@ -348,9 +348,9 @@
             'test_verify_exact_field_offset',
             """struct foo_s { short a; int b; };""")
         e = raises(ffi.error, ffi.new, "struct foo_s *", [])    # lazily
-        assert str(e.value) == ("struct foo_s: wrong offset for field 'b' (cdef "
-                           'says 0, but C compiler says 4). fix it or use "...;" '
-                           "in the cdef for struct foo_s to make it flexible")
+        assert str(e.value).startswith(
+            "struct foo_s: wrong offset for field 'b' (cdef "
+            'says 0, but C compiler says 4). fix it or use "...;" ')
 
     def test_type_caching(self):
         ffi1, lib1 = self.prepare(
diff --git a/pypy/module/cpyext/include/pyport.h b/pypy/module/cpyext/include/pyport.h
--- a/pypy/module/cpyext/include/pyport.h
+++ b/pypy/module/cpyext/include/pyport.h
@@ -5,68 +5,34 @@
 #include 
 #endif
 
-/* typedefs for some C9X-defined synonyms for integral types. */
-#ifdef HAVE_LONG_LONG
+/* long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG 1
+#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. */
-#define PY_LLONG_MAX __LONG_LONG_MAX__
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL)
-#else
-/* Otherwise, rely on two's complement. */
-#define PY_ULLONG_MAX (~0ULL)
-#define PY_LLONG_MAX  ((long long)(PY_ULLONG_MAX>>1))
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#endif /* LLONG_MAX */
-#endif
-#endif /* HAVE_LONG_LONG */
-
-/* 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
-#define PY_SIZE_MAX SIZE_MAX
-#else
-#define PY_SIZE_MAX ((size_t)-1)
 #endif
 
-/* CPython needs this for the c-extension datetime, which is pure python on PyPy 
-   downstream packages assume it is here (Pandas for instance) */
-#include  
+#define PY_UINT32_T uint32_t
+#define PY_UINT64_T uint64_t
+
+/* Signed variants of the above */
+#define PY_INT32_T int32_t
+#define PY_INT64_T int64_t
+
 
 /* uintptr_t is the C9X name for an unsigned integral type such that a
  * legitimate void* can be cast to uintptr_t and then back to void* again
  * 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;
+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_hash_t is the same size as a pointer. */
 #define SIZEOF_PY_HASH_T SIZEOF_SIZE_T
@@ -75,17 +41,19 @@
 #define SIZEOF_PY_UHASH_T SIZEOF_SIZE_T
 typedef size_t Py_uhash_t;
 
+/* Largest possible value of size_t. */
+#define PY_SIZE_MAX SIZE_MAX
+
+/* Largest positive value of type Py_ssize_t. */
+#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
+/* Smallest negative value of type Py_ssize_t. */
+#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
+
 #include 
 
-#ifdef __va_copy
-#define Py_VA_COPY __va_copy
-#else
-#ifdef VA_LIST_IS_ARRAY
-#define Py_VA_COPY(x, y) Py_MEMCPY((x), (y), sizeof(va_list))
-#else
-#define Py_VA_COPY(x, y) (x) = (y)
-#endif
-#endif
+/* CPython needs this for the c-extension datetime, which is pure python on PyPy
+   downstream packages assume it is here (Pandas for instance) */
+#include 
 
 /*******************************
  * stat() and fstat() fiddling *
@@ -132,8 +100,7 @@
  * Hide GCC attributes from compilers that don't support them.
  */
 #if (!defined(__GNUC__) || __GNUC__ < 2 || \
-     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) && \
-    !defined(RISCOS)
+     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) )
 #define Py_GCC_ATTRIBUTE(x)
 #else
 #define Py_GCC_ATTRIBUTE(x) __attribute__(x)
@@ -148,10 +115,13 @@
 #define Py_ALIGNED(x)
 #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.
+/* Eliminate end-of-loop code not reached warnings from SunPro C
+ * when using do{...}while(0) macros
  */
+#ifdef __SUNPRO_C
+#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
+#endif
+
 #ifndef Py_LL
 #define Py_LL(x) x##LL
 #endif
@@ -160,4 +130,7 @@
 #define Py_ULL(x) Py_LL(x##U)
 #endif
 
+#define Py_VA_COPY va_copy
+
+
 #endif /* Py_PYPORT_H */
diff --git a/pypy/module/cpyext/parse/cpyext_object.h b/pypy/module/cpyext/parse/cpyext_object.h
--- a/pypy/module/cpyext/parse/cpyext_object.h
+++ b/pypy/module/cpyext/parse/cpyext_object.h
@@ -1,6 +1,6 @@
 #pragma once
 
-typedef long Py_ssize_t;
+typedef long Py_ssize_t;  /* CPython defines it in pyport.h */
 
 #define PyObject_HEAD  \
     Py_ssize_t ob_refcnt;        \
diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -77,7 +77,9 @@
     c_flock = external('flock', [rffi.INT, rffi.INT], rffi.INT,
                        save_err=rffi.RFFI_SAVE_ERRNO)
 
-def _get_error(space, funcname):
+def _raise_error_maybe(space, funcname):
+    # wrap_oserror(..., eintr_retry=True) raises an OSError or returns None
+    # when appropriate
     errno = rposix.get_saved_errno()
     return wrap_oserror(space, OSError(errno, funcname),
                         exception_name = 'w_IOError', eintr_retry=True)
@@ -109,7 +111,7 @@
             while True:
                 rv = fcntl_str(fd, op, ll_arg)
                 if rv < 0:
-                    _get_error(space, "fcntl")
+                    _raise_error_maybe(space, "fcntl")
                 else:
                     arg = rffi.charpsize2str(ll_arg, len(arg))
                     return space.newbytes(arg)
@@ -119,7 +121,7 @@
     while True:
         rv = fcntl_int(fd, op, intarg)
         if rv < 0:
-            _get_error(space, "fcntl")
+            _raise_error_maybe(space, "fcntl")
         else:
             return space.newint(rv)
 
@@ -137,7 +139,7 @@
         while True:
             rv = c_flock(fd, op)
             if rv < 0:
-                _get_error(space, "flock")
+                _raise_error_maybe(space, "flock")
             else:
                 return
     else:
@@ -191,7 +193,7 @@
         while True:
             rv = fcntl_flock(fd, op, l)
             if rv < 0:
-                _get_error(space, "fcntl")
+                _raise_error_maybe(space, "fcntl")
             else:
                 return
 
@@ -229,7 +231,7 @@
                               rffi.cast(rffi.VOIDP, ll_arg), len(arg))
                 rv = ioctl_str(fd, op, buf.raw)
                 if rv < 0:
-                    raise _get_error(space, "ioctl")
+                    _raise_error_maybe(space, "ioctl")
                 arg = rffi.charpsize2str(buf.raw, len(arg))
                 if mutate_flag != 0:
                     rwbuffer.setslice(0, arg)
@@ -257,7 +259,7 @@
                               rffi.cast(rffi.VOIDP, ll_arg), len(arg))
                 rv = ioctl_str(fd, op, buf.raw)
                 if rv < 0:
-                    raise _get_error(space, "ioctl")
+                    _raise_error_maybe(space, "ioctl")
                 arg = rffi.charpsize2str(buf.raw, len(arg))
             return space.newbytes(arg)
         finally:
@@ -267,5 +269,5 @@
     intarg = rffi.cast(rffi.INT, intarg)   # C long => C int
     rv = ioctl_int(fd, op, intarg)
     if rv < 0:
-        raise _get_error(space, "ioctl")
+        _raise_error_maybe(space, "ioctl")
     return space.newint(rv)
diff --git a/pypy/module/itertools/interp_itertools.py b/pypy/module/itertools/interp_itertools.py
--- a/pypy/module/itertools/interp_itertools.py
+++ b/pypy/module/itertools/interp_itertools.py
@@ -1068,7 +1068,8 @@
                 w_newkey = w_newvalue
             else:
                 w_newkey = space.call_function(groupby.w_keyfunc, w_newvalue)
-            assert groupby.w_currvalue is None
+            #assert groupby.w_currvalue is None
+            # ^^^ check disabled, see http://bugs.python.org/issue30347
             groupby.w_currkey = w_newkey
             groupby.w_currvalue = w_newvalue
 
diff --git a/pypy/module/itertools/test/test_itertools.py b/pypy/module/itertools/test/test_itertools.py
--- a/pypy/module/itertools/test/test_itertools.py
+++ b/pypy/module/itertools/test/test_itertools.py
@@ -541,6 +541,16 @@
         assert a == []
         assert b == [(True, 9)]
 
+    def test_groupby_crash(self):
+        # see http://bugs.python.org/issue30347
+        from itertools import groupby
+        def f(n):
+            if n == 5:
+                list(b)
+            return n != 6
+        for (k, b) in groupby(range(10), f):
+            list(b)  # shouldn't crash
+
     def test_iterables(self):
         import itertools
 
diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -448,6 +448,10 @@
     def get_empty_storage(self):
         raise NotImplementedError
 
+    def setitem_str(self, w_dict, key, w_value):
+        w_dict.setitem(self.space.newtext(key), w_value)
+
+
     @jit.look_inside_iff(lambda self, w_dict:
                          w_dict_unrolling_heuristic(w_dict))
     def w_keys(self, w_dict):
diff --git a/pypy/objspace/std/jsondict.py b/pypy/objspace/std/jsondict.py
--- a/pypy/objspace/std/jsondict.py
+++ b/pypy/objspace/std/jsondict.py
@@ -89,6 +89,10 @@
         self.switch_to_unicode_strategy(w_dict)
         w_dict.setitem(w_key, w_value)
 
+    # for setitem_str use the default implementation
+    # because the jsonmap needs a wrapped key anyway
+
+
     def setdefault(self, w_dict, w_key, w_default):
         if self.is_correct_type(w_key):
             w_result = self.getitem_unicode(w_dict, w_key)
diff --git a/pypy/objspace/std/test/test_jsondict.py b/pypy/objspace/std/test/test_jsondict.py
--- a/pypy/objspace/std/test/test_jsondict.py
+++ b/pypy/objspace/std/test/test_jsondict.py
@@ -103,3 +103,16 @@
         str(d)
         repr(d)
 
+    def test_objdict_bug(self):
+        import _pypyjson
+        a = """{"foo": "bar"}"""
+        d = _pypyjson.loads(a)
+        d['foo'] = 'x'
+
+        class Obj(object):
+            pass
+
+        x = Obj()
+        x.__dict__ = d
+
+        x.foo = 'baz'  # used to segfault on pypy3
diff --git a/pypy/tool/pytest/apptest2.py b/pypy/tool/pytest/apptest2.py
--- a/pypy/tool/pytest/apptest2.py
+++ b/pypy/tool/pytest/apptest2.py
@@ -46,6 +46,7 @@
             if not isinstance(w_obj, pypy.interpreter.function.Function):
                 continue
             items.append(AppTestFunction(name, self, w_obj))
+        items.sort(key=lambda item: item.reportinfo()[:2])
         return items
 
     def setup(self):
diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py
--- a/rpython/rlib/rbigint.py
+++ b/rpython/rlib/rbigint.py
@@ -1174,7 +1174,7 @@
     def lshift(self, int_other):
         if int_other < 0:
             raise ValueError("negative shift count")
-        elif int_other == 0:
+        elif int_other == 0 or self.sign == 0:
             return self
 
         # wordshift, remshift = divmod(int_other, SHIFT)
@@ -1183,8 +1183,6 @@
 
         if not remshift:
             # So we can avoid problems with eq, AND avoid the need for normalize.
-            if self.sign == 0:
-                return self
             return rbigint([NULLDIGIT] * wordshift + self._digits, self.sign, self.numdigits() + wordshift)
 
         oldsize = self.numdigits()
diff --git a/rpython/rlib/test/test_rbigint.py b/rpython/rlib/test/test_rbigint.py
--- a/rpython/rlib/test/test_rbigint.py
+++ b/rpython/rlib/test/test_rbigint.py
@@ -704,6 +704,10 @@
         # Chek value accuracy.
         assert rbigint.fromlong(18446744073709551615L).rshift(1).tolong() == 18446744073709551615L >> 1
 
+    def test_shift_optimization(self):
+        # does not crash with memory error
+        assert rbigint.fromint(0).lshift(sys.maxint).tolong() == 0
+
     def test_qshift(self):
         for x in range(10):
             for y in range(1, 161, 16):
diff --git a/rpython/rlib/unicodedata/CaseFolding-11.0.0.txt b/rpython/rlib/unicodedata/CaseFolding-11.0.0.txt
new file mode 100644
--- /dev/null
+++ b/rpython/rlib/unicodedata/CaseFolding-11.0.0.txt
@@ -0,0 +1,1574 @@
+# CaseFolding-11.0.0.txt
+# Date: 2018-01-31, 08:20:09 GMT
+# © 2018 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Unicode Character Database
+#   For documentation, see http://www.unicode.org/reports/tr44/
+#
+# Case Folding Properties
+#
+# This file is a supplement to the UnicodeData file.
+# It provides a case folding mapping generated from the Unicode Character Database.
+# If all characters are mapped according to the full mapping below, then
+# case differences (according to UnicodeData.txt and SpecialCasing.txt)
+# are eliminated.
+#
+# The data supports both implementations that require simple case foldings
+# (where string lengths don't change), and implementations that allow full case folding
+# (where string lengths may grow). Note that where they can be supported, the
+# full case foldings are superior: for example, they allow "MASSE" and "Maße" to match.
+#
+# All code points not listed in this file map to themselves.
+#
+# NOTE: case folding does not preserve normalization formats!
+#
+# For information on case folding, including how to have case folding
+# preserve normalization formats, see Section 3.13 Default Case Algorithms in
+# The Unicode Standard.
+#
+# ================================================================================
+# Format
+# ================================================================================
+# The entries in this file are in the following machine-readable format:
+#
+# ; ; ; # 
+#
+# The status field is:
+# C: common case folding, common mappings shared by both simple and full mappings.
+# F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+# S: simple case folding, mappings to single characters where different from F.
+# T: special case for uppercase I and dotted uppercase I
+#    - For non-Turkic languages, this mapping is normally not used.
+#    - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+#      Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+#      See the discussions of case mapping in the Unicode Standard for more information.
+#
+# Usage:
+#  A. To do a simple case folding, use the mappings with status C + S.
+#  B. To do a full case folding, use the mappings with status C + F.
+#
+#    The mappings with status T can be used or omitted depending on the desired case-folding
+#    behavior. (The default option is to exclude them.)
+#
+# =================================================================
+
+# Property: Case_Folding
+
+#  All code points not explicitly listed for Case_Folding
+#  have the value C for the status field, and the code point itself for the mapping field.
+
+# =================================================================
+0041; C; 0061; # LATIN CAPITAL LETTER A
+0042; C; 0062; # LATIN CAPITAL LETTER B
+0043; C; 0063; # LATIN CAPITAL LETTER C
+0044; C; 0064; # LATIN CAPITAL LETTER D
+0045; C; 0065; # LATIN CAPITAL LETTER E
+0046; C; 0066; # LATIN CAPITAL LETTER F
+0047; C; 0067; # LATIN CAPITAL LETTER G
+0048; C; 0068; # LATIN CAPITAL LETTER H
+0049; C; 0069; # LATIN CAPITAL LETTER I
+0049; T; 0131; # LATIN CAPITAL LETTER I
+004A; C; 006A; # LATIN CAPITAL LETTER J
+004B; C; 006B; # LATIN CAPITAL LETTER K
+004C; C; 006C; # LATIN CAPITAL LETTER L
+004D; C; 006D; # LATIN CAPITAL LETTER M
+004E; C; 006E; # LATIN CAPITAL LETTER N
+004F; C; 006F; # LATIN CAPITAL LETTER O
+0050; C; 0070; # LATIN CAPITAL LETTER P
+0051; C; 0071; # LATIN CAPITAL LETTER Q
+0052; C; 0072; # LATIN CAPITAL LETTER R
+0053; C; 0073; # LATIN CAPITAL LETTER S
+0054; C; 0074; # LATIN CAPITAL LETTER T
+0055; C; 0075; # LATIN CAPITAL LETTER U
+0056; C; 0076; # LATIN CAPITAL LETTER V
+0057; C; 0077; # LATIN CAPITAL LETTER W
+0058; C; 0078; # LATIN CAPITAL LETTER X
+0059; C; 0079; # LATIN CAPITAL LETTER Y
+005A; C; 007A; # LATIN CAPITAL LETTER Z
+00B5; C; 03BC; # MICRO SIGN
+00C0; C; 00E0; # LATIN CAPITAL LETTER A WITH GRAVE
+00C1; C; 00E1; # LATIN CAPITAL LETTER A WITH ACUTE
+00C2; C; 00E2; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+00C3; C; 00E3; # LATIN CAPITAL LETTER A WITH TILDE
+00C4; C; 00E4; # LATIN CAPITAL LETTER A WITH DIAERESIS
+00C5; C; 00E5; # LATIN CAPITAL LETTER A WITH RING ABOVE
+00C6; C; 00E6; # LATIN CAPITAL LETTER AE
+00C7; C; 00E7; # LATIN CAPITAL LETTER C WITH CEDILLA
+00C8; C; 00E8; # LATIN CAPITAL LETTER E WITH GRAVE
+00C9; C; 00E9; # LATIN CAPITAL LETTER E WITH ACUTE
+00CA; C; 00EA; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+00CB; C; 00EB; # LATIN CAPITAL LETTER E WITH DIAERESIS
+00CC; C; 00EC; # LATIN CAPITAL LETTER I WITH GRAVE
+00CD; C; 00ED; # LATIN CAPITAL LETTER I WITH ACUTE
+00CE; C; 00EE; # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+00CF; C; 00EF; # LATIN CAPITAL LETTER I WITH DIAERESIS
+00D0; C; 00F0; # LATIN CAPITAL LETTER ETH
+00D1; C; 00F1; # LATIN CAPITAL LETTER N WITH TILDE
+00D2; C; 00F2; # LATIN CAPITAL LETTER O WITH GRAVE
+00D3; C; 00F3; # LATIN CAPITAL LETTER O WITH ACUTE
+00D4; C; 00F4; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+00D5; C; 00F5; # LATIN CAPITAL LETTER O WITH TILDE
+00D6; C; 00F6; # LATIN CAPITAL LETTER O WITH DIAERESIS
+00D8; C; 00F8; # LATIN CAPITAL LETTER O WITH STROKE
+00D9; C; 00F9; # LATIN CAPITAL LETTER U WITH GRAVE
+00DA; C; 00FA; # LATIN CAPITAL LETTER U WITH ACUTE
+00DB; C; 00FB; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+00DC; C; 00FC; # LATIN CAPITAL LETTER U WITH DIAERESIS
+00DD; C; 00FD; # LATIN CAPITAL LETTER Y WITH ACUTE
+00DE; C; 00FE; # LATIN CAPITAL LETTER THORN
+00DF; F; 0073 0073; # LATIN SMALL LETTER SHARP S
+0100; C; 0101; # LATIN CAPITAL LETTER A WITH MACRON
+0102; C; 0103; # LATIN CAPITAL LETTER A WITH BREVE
+0104; C; 0105; # LATIN CAPITAL LETTER A WITH OGONEK
+0106; C; 0107; # LATIN CAPITAL LETTER C WITH ACUTE
+0108; C; 0109; # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+010A; C; 010B; # LATIN CAPITAL LETTER C WITH DOT ABOVE
+010C; C; 010D; # LATIN CAPITAL LETTER C WITH CARON
+010E; C; 010F; # LATIN CAPITAL LETTER D WITH CARON
+0110; C; 0111; # LATIN CAPITAL LETTER D WITH STROKE
+0112; C; 0113; # LATIN CAPITAL LETTER E WITH MACRON
+0114; C; 0115; # LATIN CAPITAL LETTER E WITH BREVE
+0116; C; 0117; # LATIN CAPITAL LETTER E WITH DOT ABOVE
+0118; C; 0119; # LATIN CAPITAL LETTER E WITH OGONEK
+011A; C; 011B; # LATIN CAPITAL LETTER E WITH CARON
+011C; C; 011D; # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+011E; C; 011F; # LATIN CAPITAL LETTER G WITH BREVE
+0120; C; 0121; # LATIN CAPITAL LETTER G WITH DOT ABOVE
+0122; C; 0123; # LATIN CAPITAL LETTER G WITH CEDILLA
+0124; C; 0125; # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+0126; C; 0127; # LATIN CAPITAL LETTER H WITH STROKE
+0128; C; 0129; # LATIN CAPITAL LETTER I WITH TILDE
+012A; C; 012B; # LATIN CAPITAL LETTER I WITH MACRON
+012C; C; 012D; # LATIN CAPITAL LETTER I WITH BREVE
+012E; C; 012F; # LATIN CAPITAL LETTER I WITH OGONEK
+0130; F; 0069 0307; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0130; T; 0069; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0132; C; 0133; # LATIN CAPITAL LIGATURE IJ
+0134; C; 0135; # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+0136; C; 0137; # LATIN CAPITAL LETTER K WITH CEDILLA
+0139; C; 013A; # LATIN CAPITAL LETTER L WITH ACUTE
+013B; C; 013C; # LATIN CAPITAL LETTER L WITH CEDILLA
+013D; C; 013E; # LATIN CAPITAL LETTER L WITH CARON
+013F; C; 0140; # LATIN CAPITAL LETTER L WITH MIDDLE DOT
+0141; C; 0142; # LATIN CAPITAL LETTER L WITH STROKE
+0143; C; 0144; # LATIN CAPITAL LETTER N WITH ACUTE
+0145; C; 0146; # LATIN CAPITAL LETTER N WITH CEDILLA
+0147; C; 0148; # LATIN CAPITAL LETTER N WITH CARON
+0149; F; 02BC 006E; # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+014A; C; 014B; # LATIN CAPITAL LETTER ENG
+014C; C; 014D; # LATIN CAPITAL LETTER O WITH MACRON
+014E; C; 014F; # LATIN CAPITAL LETTER O WITH BREVE
+0150; C; 0151; # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0152; C; 0153; # LATIN CAPITAL LIGATURE OE
+0154; C; 0155; # LATIN CAPITAL LETTER R WITH ACUTE
+0156; C; 0157; # LATIN CAPITAL LETTER R WITH CEDILLA
+0158; C; 0159; # LATIN CAPITAL LETTER R WITH CARON
+015A; C; 015B; # LATIN CAPITAL LETTER S WITH ACUTE
+015C; C; 015D; # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+015E; C; 015F; # LATIN CAPITAL LETTER S WITH CEDILLA
+0160; C; 0161; # LATIN CAPITAL LETTER S WITH CARON
+0162; C; 0163; # LATIN CAPITAL LETTER T WITH CEDILLA
+0164; C; 0165; # LATIN CAPITAL LETTER T WITH CARON
+0166; C; 0167; # LATIN CAPITAL LETTER T WITH STROKE
+0168; C; 0169; # LATIN CAPITAL LETTER U WITH TILDE
+016A; C; 016B; # LATIN CAPITAL LETTER U WITH MACRON
+016C; C; 016D; # LATIN CAPITAL LETTER U WITH BREVE
+016E; C; 016F; # LATIN CAPITAL LETTER U WITH RING ABOVE
+0170; C; 0171; # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0172; C; 0173; # LATIN CAPITAL LETTER U WITH OGONEK
+0174; C; 0175; # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+0176; C; 0177; # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+0178; C; 00FF; # LATIN CAPITAL LETTER Y WITH DIAERESIS
+0179; C; 017A; # LATIN CAPITAL LETTER Z WITH ACUTE
+017B; C; 017C; # LATIN CAPITAL LETTER Z WITH DOT ABOVE
+017D; C; 017E; # LATIN CAPITAL LETTER Z WITH CARON
+017F; C; 0073; # LATIN SMALL LETTER LONG S
+0181; C; 0253; # LATIN CAPITAL LETTER B WITH HOOK
+0182; C; 0183; # LATIN CAPITAL LETTER B WITH TOPBAR
+0184; C; 0185; # LATIN CAPITAL LETTER TONE SIX
+0186; C; 0254; # LATIN CAPITAL LETTER OPEN O
+0187; C; 0188; # LATIN CAPITAL LETTER C WITH HOOK
+0189; C; 0256; # LATIN CAPITAL LETTER AFRICAN D
+018A; C; 0257; # LATIN CAPITAL LETTER D WITH HOOK
+018B; C; 018C; # LATIN CAPITAL LETTER D WITH TOPBAR
+018E; C; 01DD; # LATIN CAPITAL LETTER REVERSED E
+018F; C; 0259; # LATIN CAPITAL LETTER SCHWA
+0190; C; 025B; # LATIN CAPITAL LETTER OPEN E
+0191; C; 0192; # LATIN CAPITAL LETTER F WITH HOOK
+0193; C; 0260; # LATIN CAPITAL LETTER G WITH HOOK
+0194; C; 0263; # LATIN CAPITAL LETTER GAMMA
+0196; C; 0269; # LATIN CAPITAL LETTER IOTA
+0197; C; 0268; # LATIN CAPITAL LETTER I WITH STROKE
+0198; C; 0199; # LATIN CAPITAL LETTER K WITH HOOK
+019C; C; 026F; # LATIN CAPITAL LETTER TURNED M
+019D; C; 0272; # LATIN CAPITAL LETTER N WITH LEFT HOOK
+019F; C; 0275; # LATIN CAPITAL LETTER O WITH MIDDLE TILDE
+01A0; C; 01A1; # LATIN CAPITAL LETTER O WITH HORN
+01A2; C; 01A3; # LATIN CAPITAL LETTER OI
+01A4; C; 01A5; # LATIN CAPITAL LETTER P WITH HOOK
+01A6; C; 0280; # LATIN LETTER YR
+01A7; C; 01A8; # LATIN CAPITAL LETTER TONE TWO
+01A9; C; 0283; # LATIN CAPITAL LETTER ESH
+01AC; C; 01AD; # LATIN CAPITAL LETTER T WITH HOOK
+01AE; C; 0288; # LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
+01AF; C; 01B0; # LATIN CAPITAL LETTER U WITH HORN
+01B1; C; 028A; # LATIN CAPITAL LETTER UPSILON
+01B2; C; 028B; # LATIN CAPITAL LETTER V WITH HOOK
+01B3; C; 01B4; # LATIN CAPITAL LETTER Y WITH HOOK
+01B5; C; 01B6; # LATIN CAPITAL LETTER Z WITH STROKE
+01B7; C; 0292; # LATIN CAPITAL LETTER EZH
+01B8; C; 01B9; # LATIN CAPITAL LETTER EZH REVERSED
+01BC; C; 01BD; # LATIN CAPITAL LETTER TONE FIVE
+01C4; C; 01C6; # LATIN CAPITAL LETTER DZ WITH CARON
+01C5; C; 01C6; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
+01C7; C; 01C9; # LATIN CAPITAL LETTER LJ
+01C8; C; 01C9; # LATIN CAPITAL LETTER L WITH SMALL LETTER J
+01CA; C; 01CC; # LATIN CAPITAL LETTER NJ
+01CB; C; 01CC; # LATIN CAPITAL LETTER N WITH SMALL LETTER J
+01CD; C; 01CE; # LATIN CAPITAL LETTER A WITH CARON
+01CF; C; 01D0; # LATIN CAPITAL LETTER I WITH CARON
+01D1; C; 01D2; # LATIN CAPITAL LETTER O WITH CARON
+01D3; C; 01D4; # LATIN CAPITAL LETTER U WITH CARON
+01D5; C; 01D6; # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01D7; C; 01D8; # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D9; C; 01DA; # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+01DB; C; 01DC; # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01DE; C; 01DF; # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+01E0; C; 01E1; # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+01E2; C; 01E3; # LATIN CAPITAL LETTER AE WITH MACRON
+01E4; C; 01E5; # LATIN CAPITAL LETTER G WITH STROKE
+01E6; C; 01E7; # LATIN CAPITAL LETTER G WITH CARON
+01E8; C; 01E9; # LATIN CAPITAL LETTER K WITH CARON
+01EA; C; 01EB; # LATIN CAPITAL LETTER O WITH OGONEK
+01EC; C; 01ED; # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+01EE; C; 01EF; # LATIN CAPITAL LETTER EZH WITH CARON
+01F0; F; 006A 030C; # LATIN SMALL LETTER J WITH CARON
+01F1; C; 01F3; # LATIN CAPITAL LETTER DZ
+01F2; C; 01F3; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z
+01F4; C; 01F5; # LATIN CAPITAL LETTER G WITH ACUTE
+01F6; C; 0195; # LATIN CAPITAL LETTER HWAIR
+01F7; C; 01BF; # LATIN CAPITAL LETTER WYNN
+01F8; C; 01F9; # LATIN CAPITAL LETTER N WITH GRAVE
+01FA; C; 01FB; # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+01FC; C; 01FD; # LATIN CAPITAL LETTER AE WITH ACUTE
+01FE; C; 01FF; # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+0200; C; 0201; # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+0202; C; 0203; # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+0204; C; 0205; # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+0206; C; 0207; # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+0208; C; 0209; # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+020A; C; 020B; # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+020C; C; 020D; # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+020E; C; 020F; # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+0210; C; 0211; # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+0212; C; 0213; # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+0214; C; 0215; # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+0216; C; 0217; # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+0218; C; 0219; # LATIN CAPITAL LETTER S WITH COMMA BELOW
+021A; C; 021B; # LATIN CAPITAL LETTER T WITH COMMA BELOW
+021C; C; 021D; # LATIN CAPITAL LETTER YOGH
+021E; C; 021F; # LATIN CAPITAL LETTER H WITH CARON
+0220; C; 019E; # LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+0222; C; 0223; # LATIN CAPITAL LETTER OU
+0224; C; 0225; # LATIN CAPITAL LETTER Z WITH HOOK
+0226; C; 0227; # LATIN CAPITAL LETTER A WITH DOT ABOVE
+0228; C; 0229; # LATIN CAPITAL LETTER E WITH CEDILLA
+022A; C; 022B; # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+022C; C; 022D; # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+022E; C; 022F; # LATIN CAPITAL LETTER O WITH DOT ABOVE
+0230; C; 0231; # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+0232; C; 0233; # LATIN CAPITAL LETTER Y WITH MACRON
+023A; C; 2C65; # LATIN CAPITAL LETTER A WITH STROKE
+023B; C; 023C; # LATIN CAPITAL LETTER C WITH STROKE
+023D; C; 019A; # LATIN CAPITAL LETTER L WITH BAR
+023E; C; 2C66; # LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+0241; C; 0242; # LATIN CAPITAL LETTER GLOTTAL STOP
+0243; C; 0180; # LATIN CAPITAL LETTER B WITH STROKE
+0244; C; 0289; # LATIN CAPITAL LETTER U BAR
+0245; C; 028C; # LATIN CAPITAL LETTER TURNED V
+0246; C; 0247; # LATIN CAPITAL LETTER E WITH STROKE
+0248; C; 0249; # LATIN CAPITAL LETTER J WITH STROKE
+024A; C; 024B; # LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
+024C; C; 024D; # LATIN CAPITAL LETTER R WITH STROKE
+024E; C; 024F; # LATIN CAPITAL LETTER Y WITH STROKE
+0345; C; 03B9; # COMBINING GREEK YPOGEGRAMMENI
+0370; C; 0371; # GREEK CAPITAL LETTER HETA
+0372; C; 0373; # GREEK CAPITAL LETTER ARCHAIC SAMPI
+0376; C; 0377; # GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+037F; C; 03F3; # GREEK CAPITAL LETTER YOT
+0386; C; 03AC; # GREEK CAPITAL LETTER ALPHA WITH TONOS
+0388; C; 03AD; # GREEK CAPITAL LETTER EPSILON WITH TONOS
+0389; C; 03AE; # GREEK CAPITAL LETTER ETA WITH TONOS
+038A; C; 03AF; # GREEK CAPITAL LETTER IOTA WITH TONOS
+038C; C; 03CC; # GREEK CAPITAL LETTER OMICRON WITH TONOS
+038E; C; 03CD; # GREEK CAPITAL LETTER UPSILON WITH TONOS
+038F; C; 03CE; # GREEK CAPITAL LETTER OMEGA WITH TONOS
+0390; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+0391; C; 03B1; # GREEK CAPITAL LETTER ALPHA
+0392; C; 03B2; # GREEK CAPITAL LETTER BETA
+0393; C; 03B3; # GREEK CAPITAL LETTER GAMMA
+0394; C; 03B4; # GREEK CAPITAL LETTER DELTA
+0395; C; 03B5; # GREEK CAPITAL LETTER EPSILON
+0396; C; 03B6; # GREEK CAPITAL LETTER ZETA
+0397; C; 03B7; # GREEK CAPITAL LETTER ETA
+0398; C; 03B8; # GREEK CAPITAL LETTER THETA
+0399; C; 03B9; # GREEK CAPITAL LETTER IOTA
+039A; C; 03BA; # GREEK CAPITAL LETTER KAPPA
+039B; C; 03BB; # GREEK CAPITAL LETTER LAMDA
+039C; C; 03BC; # GREEK CAPITAL LETTER MU
+039D; C; 03BD; # GREEK CAPITAL LETTER NU
+039E; C; 03BE; # GREEK CAPITAL LETTER XI
+039F; C; 03BF; # GREEK CAPITAL LETTER OMICRON
+03A0; C; 03C0; # GREEK CAPITAL LETTER PI
+03A1; C; 03C1; # GREEK CAPITAL LETTER RHO
+03A3; C; 03C3; # GREEK CAPITAL LETTER SIGMA
+03A4; C; 03C4; # GREEK CAPITAL LETTER TAU
+03A5; C; 03C5; # GREEK CAPITAL LETTER UPSILON
+03A6; C; 03C6; # GREEK CAPITAL LETTER PHI
+03A7; C; 03C7; # GREEK CAPITAL LETTER CHI
+03A8; C; 03C8; # GREEK CAPITAL LETTER PSI
+03A9; C; 03C9; # GREEK CAPITAL LETTER OMEGA
+03AA; C; 03CA; # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+03AB; C; 03CB; # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+03B0; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+03C2; C; 03C3; # GREEK SMALL LETTER FINAL SIGMA

From pypy.commits at gmail.com  Tue Jan 14 09:26:54 2020
From: pypy.commits at gmail.com (arigo)
Date: Tue, 14 Jan 2020 06:26:54 -0800 (PST)
Subject: [pypy-commit] pypy default: Detect code that annotates as "raise
 None" and complain
Message-ID: <5e1dcfae.1c69fb81.41ca2.06ee@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98532:f35d1ea7de4f
Date: 2020-01-14 15:26 +0100
http://bitbucket.org/pypy/pypy/changeset/f35d1ea7de4f/

Log:	Detect code that annotates as "raise None" and complain

diff --git a/rpython/rtyper/debug.py b/rpython/rtyper/debug.py
--- a/rpython/rtyper/debug.py
+++ b/rpython/rtyper/debug.py
@@ -32,6 +32,12 @@
         return s_x.nonnoneify()
 
     def specialize_call(self, hop):
+        from rpython.annotator import model as annmodel
+        from rpython.rtyper.error import TyperError
+        if annmodel.s_None.contains(hop.args_s[0]):
+            raise TyperError("ll_assert_not_none(None) detected.  This might "
+                             "come from something that annotates as "
+                             "'raise None'.")
         [v0] = hop.inputargs(hop.args_r[0])
         hop.exception_cannot_occur()
         hop.genop('debug_assert_not_none', [v0])
diff --git a/rpython/rtyper/test/test_exception.py b/rpython/rtyper/test/test_exception.py
--- a/rpython/rtyper/test/test_exception.py
+++ b/rpython/rtyper/test/test_exception.py
@@ -3,7 +3,7 @@
 from rpython.translator.translator import TranslationContext
 from rpython.rtyper.test.tool import BaseRtypingTest
 from rpython.rtyper.llinterp import LLException
-from rpython.rtyper.error import MissingRTypeOperation
+from rpython.rtyper.error import MissingRTypeOperation, TyperError
 
 
 class MyException(Exception):
@@ -164,3 +164,10 @@
             except OverflowError:
                 return 42
         py.test.raises(MissingRTypeOperation, self.interpret, f, [])
+
+    def test_cannot_raise_something_annotated_as_none(self):
+        def g():
+            return None
+        def f():
+            raise g()
+        py.test.raises(TyperError, rtype, f)

From pypy.commits at gmail.com  Tue Jan 14 09:29:54 2020
From: pypy.commits at gmail.com (arigo)
Date: Tue, 14 Jan 2020 06:29:54 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: Use a new _raise_error_always() function
 call for places that are missing loops
Message-ID: <5e1dd062.1c69fb81.b9030.7944@mx.google.com>

Author: Armin Rigo 
Branch: py3.6
Changeset: r98533:ce8858de481f
Date: 2020-01-14 15:29 +0100
http://bitbucket.org/pypy/pypy/changeset/ce8858de481f/

Log:	Use a new _raise_error_always() function call for places that are
	missing loops to retry. Maybe we should add these loops, too; I
	didn't check

diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -81,8 +81,14 @@
     # wrap_oserror(..., eintr_retry=True) raises an OSError or returns None
     # when appropriate
     errno = rposix.get_saved_errno()
-    return wrap_oserror(space, OSError(errno, funcname),
-                        exception_name = 'w_IOError', eintr_retry=True)
+    wrap_oserror(space, OSError(errno, funcname),
+                 exception_name = 'w_IOError', eintr_retry=True)
+
+def _raise_error_always(space, funcname):
+    # this variant never returns normally, and doesn't retry if it gets EINTR.
+    errno = rposix.get_saved_errno()
+    raise wrap_oserror(space, OSError(errno, funcname),
+                       exception_name = 'w_IOError', eintr_retry=False)
 
 @unwrap_spec(op=int, w_arg=WrappedDefault(0))
 def fcntl(space, w_fd, op, w_arg):
@@ -231,7 +237,7 @@
                               rffi.cast(rffi.VOIDP, ll_arg), len(arg))
                 rv = ioctl_str(fd, op, buf.raw)
                 if rv < 0:
-                    _raise_error_maybe(space, "ioctl")
+                    _raise_error_always(space, "ioctl")
                 arg = rffi.charpsize2str(buf.raw, len(arg))
                 if mutate_flag != 0:
                     rwbuffer.setslice(0, arg)
@@ -259,7 +265,7 @@
                               rffi.cast(rffi.VOIDP, ll_arg), len(arg))
                 rv = ioctl_str(fd, op, buf.raw)
                 if rv < 0:
-                    _raise_error_maybe(space, "ioctl")
+                    _raise_error_always(space, "ioctl")
                 arg = rffi.charpsize2str(buf.raw, len(arg))
             return space.newbytes(arg)
         finally:
@@ -269,5 +275,5 @@
     intarg = rffi.cast(rffi.INT, intarg)   # C long => C int
     rv = ioctl_int(fd, op, intarg)
     if rv < 0:
-        _raise_error_maybe(space, "ioctl")
+        _raise_error_always(space, "ioctl")
     return space.newint(rv)

From pypy.commits at gmail.com  Tue Jan 14 09:30:29 2020
From: pypy.commits at gmail.com (arigo)
Date: Tue, 14 Jan 2020 06:30:29 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: hg merge default
Message-ID: <5e1dd085.1c69fb81.1e869.48c3@mx.google.com>

Author: Armin Rigo 
Branch: py3.6
Changeset: r98534:a443ea8e15fc
Date: 2020-01-14 15:29 +0100
http://bitbucket.org/pypy/pypy/changeset/a443ea8e15fc/

Log:	hg merge default

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 all: pypy-c cffi_imports
 
 PYPY_EXECUTABLE := $(shell which pypy)
-URAM := $(shell python -c "import sys; print 4.5 if sys.maxint>1<<32 else 2.5")
 
 ifeq ($(PYPY_EXECUTABLE),)
 RUNINTERP = python
@@ -10,6 +9,8 @@
 RUNINTERP = $(PYPY_EXECUTABLE)
 endif
 
+URAM := $(shell $(RUNINTERP) -c "import sys; print 4.5 if sys.maxint>1<<32 else 2.5")
+
 .PHONY: pypy-c cffi_imports
 
 pypy-c:
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -263,6 +263,7 @@
             dict_w[name] = w_descr
             i += 1
 
+WARN_MISSING_SLOTS = False
 missing_slots={}
 def warn_missing_slot(space, method_name, slot_name, w_type):
     if not we_are_translated():
@@ -289,7 +290,8 @@
 
         if not slot_func_helper:
             if not slot_apifunc:
-                warn_missing_slot(space, method_name, slot_name, w_type)
+                if WARN_MISSING_SLOTS:
+                    warn_missing_slot(space, method_name, slot_name, w_type)
                 continue
             slot_func_helper = slot_apifunc.get_llhelper(space)
         fill_slot(space, pto, w_type, slot_names, slot_func_helper)
diff --git a/rpython/rtyper/debug.py b/rpython/rtyper/debug.py
--- a/rpython/rtyper/debug.py
+++ b/rpython/rtyper/debug.py
@@ -32,6 +32,12 @@
         return s_x.nonnoneify()
 
     def specialize_call(self, hop):
+        from rpython.annotator import model as annmodel
+        from rpython.rtyper.error import TyperError
+        if annmodel.s_None.contains(hop.args_s[0]):
+            raise TyperError("ll_assert_not_none(None) detected.  This might "
+                             "come from something that annotates as "
+                             "'raise None'.")
         [v0] = hop.inputargs(hop.args_r[0])
         hop.exception_cannot_occur()
         hop.genop('debug_assert_not_none', [v0])
diff --git a/rpython/rtyper/test/test_exception.py b/rpython/rtyper/test/test_exception.py
--- a/rpython/rtyper/test/test_exception.py
+++ b/rpython/rtyper/test/test_exception.py
@@ -3,7 +3,7 @@
 from rpython.translator.translator import TranslationContext
 from rpython.rtyper.test.tool import BaseRtypingTest
 from rpython.rtyper.llinterp import LLException
-from rpython.rtyper.error import MissingRTypeOperation
+from rpython.rtyper.error import MissingRTypeOperation, TyperError
 
 
 class MyException(Exception):
@@ -164,3 +164,10 @@
             except OverflowError:
                 return 42
         py.test.raises(MissingRTypeOperation, self.interpret, f, [])
+
+    def test_cannot_raise_something_annotated_as_none(self):
+        def g():
+            return None
+        def f():
+            raise g()
+        py.test.raises(TyperError, rtype, f)
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -218,6 +218,10 @@
             fn = py.path.local(fn)
             if not fn.relto(udir):
                 newname = self.targetdir.join(fn.basename)
+                if newname.check(exists=True):
+                    raise ValueError(
+                        "Cannot have two different separate_module_sources "
+                        "with the same basename, please rename one: %s" % fn.basename)
                 fn.copy(newname)
                 fn = newname
             extrafiles.append(fn)

From pypy.commits at gmail.com  Tue Jan 14 13:02:42 2020
From: pypy.commits at gmail.com (antocuni)
Date: Tue, 14 Jan 2020 10:02:42 -0800 (PST)
Subject: [pypy-commit] pypy hpy: move the attach_legacy_methods logic into
 interp_cpy_compat, where it belongs
Message-ID: <5e1e0242.1c69fb81.67def.8cc9@mx.google.com>

Author: Antonio Cuni 
Branch: hpy
Changeset: r98535:12ac759ab903
Date: 2020-01-14 18:55 +0100
http://bitbucket.org/pypy/pypy/changeset/12ac759ab903/

Log:	move the attach_legacy_methods logic into interp_cpy_compat, where
	it belongs

diff --git a/pypy/module/hpy_universal/interp_cpy_compat.py b/pypy/module/hpy_universal/interp_cpy_compat.py
--- a/pypy/module/hpy_universal/interp_cpy_compat.py
+++ b/pypy/module/hpy_universal/interp_cpy_compat.py
@@ -1,8 +1,12 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rlib.rarithmetic import widen
 from pypy.interpreter.error import OperationError, oefmt
+from pypy.module.cpyext import pyobject
+from pypy.module.cpyext.methodobject import PyMethodDef, PyCFunction
+from pypy.module.cpyext.modsupport import convert_method_defs
 from pypy.module.hpy_universal.apiset import API
 from pypy.module.hpy_universal import handles
-from pypy.module.cpyext import pyobject
+from pypy.module.hpy_universal import llapi
 
 @API.func("HPy HPy_FromPyObject(HPyContext ctx, void *obj)")
 def HPy_FromPyObject(space, ctx, obj):
@@ -14,3 +18,33 @@
     w_obj = handles.deref(space, h)
     pyobj = pyobject.make_ref(space, w_obj)
     return rffi.cast(rffi.VOIDP, pyobj)
+
+
+def attach_legacy_methods(space, hpymethods, w_mod, modname):
+    """
+    Convert HPyMethodDef[] into PyMethodDef[], and wrap the methods into the
+    proper cpyext.W_*Function objects
+    """
+    PyMethodDefP = rffi.CArrayPtr(PyMethodDef)
+
+    # convert hpymethods into a C array of PyMethodDef
+    dict_w = {}
+    n = len(hpymethods)
+    with lltype.scoped_alloc(PyMethodDefP.TO, n+1) as pymethods:
+        for i in range(n):
+            src = hpymethods[i] # HPyMethodDef
+            dst = pymethods[i]  # PyMethodDef
+            dst.c_ml_name = src.c_ml_name
+            dst.c_ml_doc = src.c_ml_doc
+            # for legacy methods, ml_meth contains a PyCFunction which can be
+            # called using the old C-API/cpyext calling convention
+            dst.c_ml_meth = rffi.cast(PyCFunction, src.c_ml_meth)
+            rffi.setintfield(dst, 'c_ml_flags', widen(src.c_ml_flags) & ~llapi._HPy_METH)
+        pymethods[n].c_ml_name = lltype.nullptr(rffi.CONST_CCHARP.TO)
+        #
+        # convert_method_defs expects a PyMethodDef*, not a PyMethodDef[]
+        p_pymethods = rffi.cast(lltype.Ptr(PyMethodDef), pymethods)
+        convert_method_defs(space, dict_w, p_pymethods, None, w_mod, modname)
+
+    for key, w_func in dict_w.items():
+        space.setattr(w_mod, space.newtext(key), w_func)
diff --git a/pypy/module/hpy_universal/interp_module.py b/pypy/module/hpy_universal/interp_module.py
--- a/pypy/module/hpy_universal/interp_module.py
+++ b/pypy/module/hpy_universal/interp_module.py
@@ -6,6 +6,7 @@
 from pypy.module.hpy_universal import llapi
 from pypy.module.hpy_universal import handles
 from pypy.module.hpy_universal import interp_extfunc
+from pypy.module.hpy_universal.interp_cpy_compat import attach_legacy_methods
 
 
 @API.func("HPy HPyModule_Create(HPyContext ctx, HPyModuleDef *def)")
@@ -31,31 +32,3 @@
             attach_legacy_methods(space, legacy_methoddefs, w_mod, modname)
     #
     return handles.new(space, w_mod)
-
-
-def attach_legacy_methods(space, hpymethods, w_mod, modname):
-    from pypy.module.cpyext.methodobject import PyMethodDef, PyCFunction
-    from pypy.module.cpyext.modsupport import convert_method_defs
-    PyMethodDefP = rffi.CArrayPtr(PyMethodDef)
-
-    # convert hpymethods into a C array of PyMethodDef
-    dict_w = {}
-    n = len(hpymethods)
-    with lltype.scoped_alloc(PyMethodDefP.TO, n+1) as pymethods:
-        for i in range(n):
-            src = hpymethods[i] # HPyMethodDef
-            dst = pymethods[i]  # PyMethodDef
-            dst.c_ml_name = src.c_ml_name
-            dst.c_ml_doc = src.c_ml_doc
-            # for legacy methods, ml_meth contains a PyCFunction which can be
-            # called using the old C-API/cpyext calling convention
-            dst.c_ml_meth = rffi.cast(PyCFunction, src.c_ml_meth)
-            rffi.setintfield(dst, 'c_ml_flags', widen(src.c_ml_flags) & ~llapi._HPy_METH)
-        pymethods[n].c_ml_name = lltype.nullptr(rffi.CONST_CCHARP.TO)
-        #
-        # convert_method_defs expects a PyMethodDef*, not a PyMethodDef[]
-        p_pymethods = rffi.cast(lltype.Ptr(PyMethodDef), pymethods)
-        convert_method_defs(space, dict_w, p_pymethods, None, w_mod, modname)
-
-    for key, w_func in dict_w.items():
-        space.setattr(w_mod, space.newtext(key), w_func)

From pypy.commits at gmail.com  Tue Jan 14 13:02:44 2020
From: pypy.commits at gmail.com (antocuni)
Date: Tue, 14 Jan 2020 10:02:44 -0800 (PST)
Subject: [pypy-commit] pypy hpy: introduce W_CPyStaticData to manage the
 lifetime of pymethods. Previously,
 the array was freed as soon as we exited the scoped_alloc(),
 so we ended up with W_PyCFunction referencing dead memory :(
Message-ID: <5e1e0244.1c69fb81.f7b0c.49d0@mx.google.com>

Author: Antonio Cuni 
Branch: hpy
Changeset: r98536:ea75324675cd
Date: 2020-01-14 19:01 +0100
http://bitbucket.org/pypy/pypy/changeset/ea75324675cd/

Log:	introduce W_CPyStaticData to manage the lifetime of pymethods.
	Previously, the array was freed as soon as we exited the
	scoped_alloc(), so we ended up with W_PyCFunction referencing dead
	memory :(

diff --git a/pypy/module/hpy_universal/interp_cpy_compat.py b/pypy/module/hpy_universal/interp_cpy_compat.py
--- a/pypy/module/hpy_universal/interp_cpy_compat.py
+++ b/pypy/module/hpy_universal/interp_cpy_compat.py
@@ -1,6 +1,10 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rlib.rarithmetic import widen
+from rpython.rlib import rgc
 from pypy.interpreter.error import OperationError, oefmt
+from pypy.interpreter.baseobjspace import W_Root
+from pypy.interpreter.gateway import interp2app
+from pypy.interpreter.typedef import TypeDef
 from pypy.module.cpyext import pyobject
 from pypy.module.cpyext.methodobject import PyMethodDef, PyCFunction
 from pypy.module.cpyext.modsupport import convert_method_defs
@@ -30,21 +34,52 @@
     # convert hpymethods into a C array of PyMethodDef
     dict_w = {}
     n = len(hpymethods)
-    with lltype.scoped_alloc(PyMethodDefP.TO, n+1) as pymethods:
-        for i in range(n):
-            src = hpymethods[i] # HPyMethodDef
-            dst = pymethods[i]  # PyMethodDef
-            dst.c_ml_name = src.c_ml_name
-            dst.c_ml_doc = src.c_ml_doc
-            # for legacy methods, ml_meth contains a PyCFunction which can be
-            # called using the old C-API/cpyext calling convention
-            dst.c_ml_meth = rffi.cast(PyCFunction, src.c_ml_meth)
-            rffi.setintfield(dst, 'c_ml_flags', widen(src.c_ml_flags) & ~llapi._HPy_METH)
-        pymethods[n].c_ml_name = lltype.nullptr(rffi.CONST_CCHARP.TO)
-        #
-        # convert_method_defs expects a PyMethodDef*, not a PyMethodDef[]
-        p_pymethods = rffi.cast(lltype.Ptr(PyMethodDef), pymethods)
-        convert_method_defs(space, dict_w, p_pymethods, None, w_mod, modname)
+    pymethods = lltype.malloc(PyMethodDefP.TO, n+1, zero=True, flavor='raw')
+    for i in range(n):
+        src = hpymethods[i] # HPyMethodDef
+        dst = pymethods[i]  # PyMethodDef
+        dst.c_ml_name = src.c_ml_name
+        dst.c_ml_doc = src.c_ml_doc
+        # for legacy methods, ml_meth contains a PyCFunction which can be
+        # called using the old C-API/cpyext calling convention
+        dst.c_ml_meth = rffi.cast(PyCFunction, src.c_ml_meth)
+        rffi.setintfield(dst, 'c_ml_flags', widen(src.c_ml_flags) & ~llapi._HPy_METH)
+    pymethods[n].c_ml_name = lltype.nullptr(rffi.CONST_CCHARP.TO)
+    #
+    # convert_method_defs expects a PyMethodDef*, not a PyMethodDef[]
+    p_pymethods = rffi.cast(lltype.Ptr(PyMethodDef), pymethods)
+    convert_method_defs(space, dict_w, p_pymethods, None, w_mod, modname)
 
     for key, w_func in dict_w.items():
         space.setattr(w_mod, space.newtext(key), w_func)
+
+    # transfer the ownership of pymethods to W_CPyStaticData
+    w_static_data = W_CPyStaticData(space, pymethods)
+    space.setattr(w_mod, space.newtext("__cpy_static_data__"), w_static_data)
+
+
+class W_CPyStaticData(W_Root):
+    """
+    An object which owns the various C data structures which we need to create
+    for compatibility with cpyext.
+    """
+
+    def __init__(self, space, pymethods):
+        self.space = space
+        self.pymethods = pymethods # PyMethodDef[]
+
+    @rgc.must_be_light_finalizer
+    def __del__(self):
+        lltype.free(self.pymethods, flavor='raw')
+        self.pymethods = None
+
+    def repr(self):
+        return self.space.newtext("")
+
+W_CPyStaticData.typedef = TypeDef(
+    'hpy_universal.CPyStaticData',
+    __module__ = 'hpy_universal',
+    __name__ = '',
+    __repr__ = interp2app(W_CPyStaticData.repr),
+    )
+W_CPyStaticData.typedef.acceptable_as_base_class = False

From pypy.commits at gmail.com  Tue Jan 14 18:37:02 2020
From: pypy.commits at gmail.com (antocuni)
Date: Tue, 14 Jan 2020 15:37:02 -0800 (PST)
Subject: [pypy-commit] pypy hpy: fix translation
Message-ID: <5e1e509e.1c69fb81.36372.6179@mx.google.com>

Author: Antonio Cuni 
Branch: hpy
Changeset: r98537:8c554d272b6a
Date: 2020-01-14 23:36 +0000
http://bitbucket.org/pypy/pypy/changeset/8c554d272b6a/

Log:	fix translation

diff --git a/pypy/module/hpy_universal/interp_cpy_compat.py b/pypy/module/hpy_universal/interp_cpy_compat.py
--- a/pypy/module/hpy_universal/interp_cpy_compat.py
+++ b/pypy/module/hpy_universal/interp_cpy_compat.py
@@ -71,7 +71,6 @@
     @rgc.must_be_light_finalizer
     def __del__(self):
         lltype.free(self.pymethods, flavor='raw')
-        self.pymethods = None
 
     def repr(self):
         return self.space.newtext("")

From pypy.commits at gmail.com  Wed Jan 15 05:10:50 2020
From: pypy.commits at gmail.com (antocuni)
Date: Wed, 15 Jan 2020 02:10:50 -0800 (PST)
Subject: [pypy-commit] pypy hpy: implement HPyUnicode_AsUTF8String
Message-ID: <5e1ee52a.1c69fb81.d5df7.bd25@mx.google.com>

Author: Antonio Cuni 
Branch: hpy
Changeset: r98538:f67708ee1204
Date: 2020-01-15 11:09 +0100
http://bitbucket.org/pypy/pypy/changeset/f67708ee1204/

Log:	implement HPyUnicode_AsUTF8String

diff --git a/pypy/module/hpy_universal/interp_unicode.py b/pypy/module/hpy_universal/interp_unicode.py
--- a/pypy/module/hpy_universal/interp_unicode.py
+++ b/pypy/module/hpy_universal/interp_unicode.py
@@ -2,6 +2,7 @@
 from rpython.rlib import rutf8
 from pypy.interpreter.error import OperationError, oefmt
 from pypy.interpreter.unicodehelper import wcharpsize2utf8
+from pypy.objspace.std import unicodeobject
 from pypy.module.hpy_universal.apiset import API
 from pypy.module.hpy_universal import handles
 
@@ -29,9 +30,10 @@
 
 @API.func("HPy HPyUnicode_AsUTF8String(HPyContext ctx, HPy h)")
 def HPyUnicode_AsUTF8String(space, ctx, h):
-    from rpython.rlib.nonconst import NonConstant
-    if NonConstant(False): return 0 # needed for the annotator
-    raise NotImplementedError
+    w_unicode = handles.deref(space, h)
+    # XXX: what should we do if w_unicode is not a str?
+    w_bytes = unicodeobject.encode_object(space, w_unicode, 'utf-8', 'strict')
+    return handles.new(space, w_bytes)
 
 @API.func("HPy HPyUnicode_FromWideChar(HPyContext ctx, const wchar_t *w, HPy_ssize_t size)")
 def HPyUnicode_FromWideChar(space, ctx, wchar_p, size):

From pypy.commits at gmail.com  Wed Jan 15 15:08:25 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 15 Jan 2020 12:08:25 -0800 (PST)
Subject: [pypy-commit] buildbot default: remove anubis slave
Message-ID: <5e1f7139.1c69fb81.4ff34.64cb@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r1126:49bd0bb8e544
Date: 2020-01-16 07:07 +1100
http://bitbucket.org/pypy/buildbot/changeset/49bd0bb8e544/

Log:	remove anubis slave

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -602,14 +602,14 @@
                   # 'category' : 'mac64',
                   # },
                   {"name": WIN32OWN,
-                   "slavenames": ["SalsaSalsa", "anubis64"],
+                   "slavenames": ["SalsaSalsa"],
                    "builddir": WIN32OWN,
                    "factory": pypyOwnTestFactoryWin,
                    "locks": [WinSlaveLock.access('counting')],
                    "category": 'win32',
                   },
                   {"name": WIN32RPYTHON,
-                   "slavenames": ["SalsaSalsa", "anubis64"],
+                   "slavenames": ["SalsaSalsa"],
                    "builddir": WIN32RPYTHON,
                    "factory": pypyRPythonTestFactoryWin,
                    "locks": [WinSlaveLock.access('counting')],
@@ -623,7 +623,7 @@
                    "category": "win32",
                   },
                   {"name" : JITWIN32,
-                   "slavenames": ["SalsaSalsa", "anubis64"],
+                   "slavenames": ["SalsaSalsa"],
                    'builddir' : JITWIN32,
                    'factory' : pypyJITTranslatedTestFactoryWin,
                    "locks": [WinSlaveLock.access('counting')],

From pypy.commits at gmail.com  Wed Jan 15 15:08:26 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 15 Jan 2020 12:08:26 -0800 (PST)
Subject: [pypy-commit] buildbot default: back out faulty 5fdc899d981d
Message-ID: <5e1f713a.1c69fb81.5485.7061@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r1127:3b4315e85cbb
Date: 2020-01-16 07:08 +1100
http://bitbucket.org/pypy/buildbot/changeset/3b4315e85cbb/

Log:	back out faulty 5fdc899d981d

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -503,14 +503,14 @@
             workdir='venv',
             haltOnFailure=False))
         factory.addStep(ShellCmd(
-            description="Create virtualenv",
-            command=prefix + [target, '-mvirtualenv', '--clear', venv_dir],
+            description="Install recent virtualenv",
+            command=prefix + [target, '-mpip', 'install', '--upgrade',
+                              'pip', 'setuptools', virt_package],
             workdir='venv',
             flunkOnFailure=True))
         factory.addStep(ShellCmd(
-            description="Install recent virtualenv",
-            command=prefix + [target, '-mpip', 'install', '--upgrade',
-                              'pip', 'setuptools', virt_package],
+            description="Create virtualenv",
+            command=prefix + [target, '-mvirtualenv', '--clear', venv_dir],
             workdir='venv',
             flunkOnFailure=True))
         factory.addStep(ShellCmd(

From pypy.commits at gmail.com  Wed Jan 15 16:37:16 2020
From: pypy.commits at gmail.com (hodgestar)
Date: Wed, 15 Jan 2020 13:37:16 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: Add Simon to the list of attendees.
Message-ID: <5e1f860c.1c69fb81.50264.a790@mx.google.com>

Author: Simon Cross 
Branch: extradoc
Changeset: r5980:e2ec4ef28249
Date: 2020-01-15 21:37 +0000
http://bitbucket.org/pypy/extradoc/changeset/e2ec4ef28249/

Log:	Add Simon to the list of attendees.

diff --git a/sprintinfo/leysin-winter-2020/people.txt b/sprintinfo/leysin-winter-2020/people.txt
--- a/sprintinfo/leysin-winter-2020/people.txt
+++ b/sprintinfo/leysin-winter-2020/people.txt
@@ -13,4 +13,5 @@
 Antonio Cuni         flexible       Les Airelles, preferably single room
 Omer Katz
 Manuel Jacob         Mar 1–8+       Les Airelles
+Simon Cross          Feb 27-Mar 6   Les Airelles, bringing partner
 ==================== ============== =======================

From pypy.commits at gmail.com  Wed Jan 15 23:24:53 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 15 Jan 2020 20:24:53 -0800 (PST)
Subject: [pypy-commit] benchmarks default: fix sqlite3 benchmark
Message-ID: <5e1fe595.1c69fb81.ed12.0941@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r437:52af1db49be7
Date: 2020-01-16 15:23 +1100
http://bitbucket.org/pypy/benchmarks/changeset/52af1db49be7/

Log:	fix sqlite3 benchmark

diff --git a/own/sqlitesynth.py b/own/sqlitesynth.py
--- a/own/sqlitesynth.py
+++ b/own/sqlitesynth.py
@@ -22,7 +22,8 @@
     conn = sqlite3.connect(":memory:")
     conn.execute('create table cos (x, y, z);')
     for i in range(300000):
-        conn.execute('insert into cos values (?, ?, ?)', [i, math.cos(i), str(i)])
+        cur = conn.execute('insert into cos values (?, ?, ?)', [i, math.cos(i), str(i)])
+        cur.close()
     conn.create_function("cos", 1, math.cos)
     for x, cosx1, cosx2 in conn.execute("select x, cos(x), y from cos"):
         assert math.cos(x) == cosx1 == cosx2
diff --git a/saveresults.py b/saveresults.py
--- a/saveresults.py
+++ b/saveresults.py
@@ -27,7 +27,6 @@
 import sys
 import time
 import urllib
-import pprint
 try:
     import urllib2
 except ImportError:
@@ -107,7 +106,6 @@
             (str(datetime.today()), data[0]['executable'],
              str(data[0]['commitid']), data[0]['benchmark']))
     print(info)
-    pprint.pprint(data)
     try:
         retries = [1, 2, 3, 6]
         while True:

From pypy.commits at gmail.com  Thu Jan 16 07:31:20 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 16 Jan 2020 04:31:20 -0800 (PST)
Subject: [pypy-commit] pypy py3.7-call-changes: limit the maximum stack size
 when doing calls with huge arguments
Message-ID: <5e205798.1c69fb81.3ddfc.c66c@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7-call-changes
Changeset: r98543:e00970e45d4b
Date: 2020-01-16 13:28 +0100
http://bitbucket.org/pypy/pypy/changeset/e00970e45d4b/

Log:	limit the maximum stack size when doing calls with huge arguments

	the _make_call method is slowly becoming a mess, should probably be
	refactored

diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -1422,18 +1422,20 @@
         nsubkwargs = 0
         if args is not None:
             for elt in args:
-                if isinstance(elt, ast.Starred):
-                    # A star-arg. If we've seen positional arguments,
-                    # pack the positional arguments into a tuple.
+                if (isinstance(elt, ast.Starred) or
+                        nargs_pushed > MAX_STACKDEPTH_CONTAINERS // 2):
+                    # If we see a star-arg or if the number of arguments is
+                    # huge we pack the positional arguments into a tuple.
                     if nargs_pushed:
                         self.emit_op_arg(ops.BUILD_TUPLE, nargs_pushed)
                         nsubargs += 1
                         nargs_pushed = 0
-                    elt.value.walkabout(self)
-                    nsubargs += 1
-                else:
-                    elt.walkabout(self)
-                    nargs_pushed += 1
+                    if isinstance(elt, ast.Starred):
+                        elt.value.walkabout(self)
+                        nsubargs += 1
+                        continue
+                elt.walkabout(self)
+                nargs_pushed += 1
             if nsubargs:
                 if nargs_pushed:
                     # Pack up any trailing positional arguments.
@@ -1461,26 +1463,38 @@
                 for kw in keywords:
                     if kw.arg is None:
                         # we're using CALL_FUNCTION_EX, pack up positional arguments first
-                        self.emit_op_arg(ops.BUILD_TUPLE, nargs_pushed)  # XXX use LOAD_CONST for empty tuple?
+                        if nargs_pushed == 0:
+                            self._load_constant_tuple([])
+                        else:
+                            self.emit_op_arg(ops.BUILD_TUPLE, nargs_pushed)
                         nsubargs = 1
                         break
+                if nsubargs == 0 and len(keywords) > MAX_STACKDEPTH_CONTAINERS // 2:
+                    if nargs_pushed == 0:
+                        self._load_constant_tuple([])
+                    else:
+                        self.emit_op_arg(ops.BUILD_TUPLE, nargs_pushed)
+                    nsubargs = 1
+
             for kw in keywords:
                 assert isinstance(kw, ast.keyword)
-                if kw.arg is None:
+                if kw.arg is None or len(keyword_names_w) > MAX_STACKDEPTH_CONTAINERS // 2:
+                    # if we see **args or if the number of keywords is huge,
+                    # pack up keywords on the stack so far
                     if keyword_names_w:
-                        # pack up keywords on the stack so far
                         self._load_constant_tuple(keyword_names_w)
                         # XXX use BUILD_MAP for size 1?
                         self.emit_op_arg(ops.BUILD_CONST_KEY_MAP, len(keyword_names_w))
                         keyword_names_w = []
                         nsubkwargs += 1
-                    kw.value.walkabout(self)
-                    nsubkwargs += 1
-                else:
-                    w_name = space.newtext(kw.arg)
-                    keyword_names_w.append(misc.intern_if_common_string(space, w_name))
-                    kw.value.walkabout(self)
-                    nkw += 1
+                    if kw.arg is None:
+                        kw.value.walkabout(self)
+                        nsubkwargs += 1
+                        continue
+                w_name = space.newtext(kw.arg)
+                keyword_names_w.append(misc.intern_if_common_string(space, w_name))
+                kw.value.walkabout(self)
+                nkw += 1
         if nsubkwargs == 0 and nsubargs == 0:
             # can use CALL_FUNCTION_KW
             assert len(keyword_names_w) > 0 # otherwise we would have used CALL_FUNCTION
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1685,12 +1685,20 @@
         counts = self.count_instructions(source)
         assert counts[ops.CALL_FUNCTION_KW] == 1
 
-        source = """def f(): x(a, b, c, *(1, 2), x=1, y=2)"""
+        source = """def f(): x(a, b, c, *(d, 2), x=1, y=2)"""
         counts = self.count_instructions(source)
+        assert counts[ops.BUILD_TUPLE] == 2
+        assert counts[ops.BUILD_TUPLE_UNPACK] == 1
         assert counts[ops.CALL_FUNCTION_EX] == 1
 
         source = """def f(): x(a, b, c, **kwargs)"""
         counts = self.count_instructions(source)
+        assert counts[ops.BUILD_TUPLE] == 1
+        assert counts[ops.CALL_FUNCTION_EX] == 1
+
+        source = """def f(): x(**kwargs)"""
+        counts = self.count_instructions(source)
+        assert ops.BUILD_TUPLE not in counts # LOAD_CONST used instead
         assert counts[ops.CALL_FUNCTION_EX] == 1
 
         source = """def f(): x.m(a, b, c)"""
@@ -1742,3 +1750,12 @@
         source = "{" + ",".join(['%s: None' % (i, ) for i in range(200)]) + "}\n"
         w_res = self.run_and_check_stacksize(source)
         assert self.space.unwrap(w_res) == dict.fromkeys(range(200))
+
+    def test_callargs(self):
+        source = "(lambda *args: args)(" + ", ".join([str(i) for i in range(200)]) + ")\n"
+        w_res = self.run_and_check_stacksize(source)
+        assert self.space.unwrap(w_res) == tuple(range(200))
+
+        source = "(lambda **args: args)(" + ", ".join(["s%s=None" % i for i in range(200)]) + ")\n"
+        w_res = self.run_and_check_stacksize(source)
+        assert self.space.unwrap(w_res) == dict.fromkeys(["s" + str(i) for i in range(200)])

From pypy.commits at gmail.com  Thu Jan 16 07:31:22 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 16 Jan 2020 04:31:22 -0800 (PST)
Subject: [pypy-commit] pypy py3.7-call-changes: what I actually wanted to
 achieve: support calls with arbitrary many arguments
Message-ID: <5e20579a.1c69fb81.81db2.19a8@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7-call-changes
Changeset: r98544:8169d516e6b1
Date: 2020-01-16 13:30 +0100
http://bitbucket.org/pypy/pypy/changeset/8169d516e6b1/

Log:	what I actually wanted to achieve: support calls with arbitrary many
	arguments

diff --git a/pypy/interpreter/astcompiler/astbuilder.py b/pypy/interpreter/astcompiler/astbuilder.py
--- a/pypy/interpreter/astcompiler/astbuilder.py
+++ b/pypy/interpreter/astcompiler/astbuilder.py
@@ -1111,8 +1111,6 @@
                 (generator_count and (keyword_count or arg_count)):
             self.error("Generator expression must be parenthesized "
                        "if not sole argument", args_node)
-        if arg_count + keyword_count + generator_count > 255:
-            self.error("more than 255 arguments", args_node)
         args = []
         keywords = []
         used_keywords = {}
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1333,12 +1333,17 @@
         res = "+".join(args)
         callargs = ", ".join(str(i) for i in range(300))
 
-        source = """def f(%s):
+        source1 = """def f(%s):
+            return %s
+x = f(%s)
+        """ % (argdef, res, callargs)
+        source2 = """def f(%s):
             return %s
 x = f(*(%s))
         """ % (argdef, res, callargs)
 
-        yield self.simple_test, source, 'x', sum(range(300))
+        yield self.simple_test, source1, 'x', sum(range(300))
+        yield self.simple_test, source2, 'x', sum(range(300))
 
 
 class TestCompilerRevDB(BaseTestCompiler):

From pypy.commits at gmail.com  Thu Jan 16 16:28:20 2020
From: pypy.commits at gmail.com (mattip)
Date: Thu, 16 Jan 2020 13:28:20 -0800 (PST)
Subject: [pypy-commit] benchmarks default: try to make sending more robust
Message-ID: <5e20d574.1c69fb81.ef3e0.278c@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r438:b5639ac3c520
Date: 2020-01-17 08:27 +1100
http://bitbucket.org/pypy/benchmarks/changeset/b5639ac3c520/

Log:	try to make sending more robust

diff --git a/runner.py b/runner.py
--- a/runner.py
+++ b/runner.py
@@ -309,6 +309,7 @@
                             baseline_path=baseline_path,
                             full_store=full_store, branch=branch)
 
+    errors = []
     for run in [CHANGED, BASELINE]:
         upload = upload_options[run]['upload']
         urls = upload_options[run]['urls']
@@ -321,8 +322,13 @@
             # prevent to upload results from the nullpython dummy
             host = force_host if force_host else socket.gethostname()
             for url in urls:
-                print(save(project, revision, results, executable, host, url,
+                try:
+                    print(save(project, revision, results, executable, host, url,
                            changed=(run == CHANGED), branch=branch))
+                except IOErrr as e:
+                    errors.append(e)
+    if len(errors) > 0:
+        raise errors[0]
 
 
 if __name__ == '__main__':
diff --git a/saveresults.py b/saveresults.py
--- a/saveresults.py
+++ b/saveresults.py
@@ -32,6 +32,7 @@
 except ImportError:
     import urllib.request as urllib2
 import json
+import pprint
 
 
 def save(project, revision, results, executeable, host, url, testing=False,
@@ -76,7 +77,7 @@
             'result_value': value,
             'branch': branch,
         }]
-        if value is None:
+        if not value:
             print("Ignoring skipped result", data)
             continue
         if res_type == "ComparisonResult":
@@ -132,6 +133,8 @@
         if hasattr(e, 'readlines'):
             response = "".join([response] + e.readlines())
         print(response)
+        print('when sending')
+        pprint.pprint(data)
         with open('error.html', 'w') as error_file:
             error_file.write(response)
         print("Server (%s) response written to error.html" % (url,))

From pypy.commits at gmail.com  Fri Jan 17 08:04:42 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 05:04:42 -0800 (PST)
Subject: [pypy-commit] pypy py3.7-call-changes: translatability
Message-ID: <5e21b0ea.1c69fb81.2ff60.af0c@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7-call-changes
Changeset: r98547:e5435b4acb17
Date: 2020-01-17 14:03 +0100
http://bitbucket.org/pypy/pypy/changeset/e5435b4acb17/

Log:	translatability

diff --git a/lib-python/3/opcode.py b/lib-python/3/opcode.py
--- a/lib-python/3/opcode.py
+++ b/lib-python/3/opcode.py
@@ -178,7 +178,6 @@
 hasnargs.append(131)
 def_op('MAKE_FUNCTION', 132)    # Number of args with default values
 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)
diff --git a/pypy/interpreter/astcompiler/assemble.py b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -768,9 +768,6 @@
 def _compute_BUILD_MAP_UNPACK_WITH_CALL(arg):
     return 1 - (arg & 0xFF)
 
-def _compute_MAKE_CLOSURE(arg):
-    return -2 - _num_args(arg) - ((arg >> 16) & 0xFFFF)
-
 def _compute_MAKE_FUNCTION(arg):
     return -1 - bool(arg & 0x01) - bool(arg & 0x02) - bool(arg & 0x04) - bool(arg & 0x08)
 
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -1459,6 +1459,7 @@
         else:
             keyword_names_w = []
             for kw in call.keywords:
+                assert isinstance(kw, ast.keyword)
                 assert kw.arg  # checked by self._call_has_no_star_args
                 w_name = space.newtext(kw.arg)
                 keyword_names_w.append(misc.intern_if_common_string(space, w_name))
@@ -1963,6 +1964,7 @@
             return
         # we might get away with using CALL_FUNCTION_KW if there are no **kwargs
         for kw in self.keywords:
+            assert isinstance(kw, ast.keyword)
             if kw.arg is None:
                 # we found a **kwarg, thus we're using CALL_FUNCTION_EX, we
                 # need to pack up positional arguments first
diff --git a/pypy/tool/opcode3.py b/pypy/tool/opcode3.py
--- a/pypy/tool/opcode3.py
+++ b/pypy/tool/opcode3.py
@@ -178,7 +178,6 @@
 hasnargs.append(131)
 def_op('MAKE_FUNCTION', 132)    # Number of args with default values
 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)

From pypy.commits at gmail.com  Fri Jan 17 15:33:50 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 12:33:50 -0800 (PST)
Subject: [pypy-commit] pypy py3.7-call-changes: document branch
Message-ID: <5e221a2e.1c69fb81.268a4.26ea@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7-call-changes
Changeset: r98548:c166c3f44788
Date: 2020-01-17 14:32 +0100
http://bitbucket.org/pypy/pypy/changeset/c166c3f44788/

Log:	document branch

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -16,3 +16,8 @@
 .. branch: bpo-16055
 
 Fixes incorrect error text for ``int('1', base=1000)``
+
+.. branch py3.7-call-changes
+
+Implement the CPython 3.7 changes to the call bytecodes, including supporting
+more than 255 arguments.

From pypy.commits at gmail.com  Fri Jan 17 15:33:52 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 12:33:52 -0800 (PST)
Subject: [pypy-commit] pypy py3.7-call-changes: switch to using CPython's
 bytecode number for CALL_METHOD
Message-ID: <5e221a30.1c69fb81.768f6.4d60@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7-call-changes
Changeset: r98549:4d330d31b630
Date: 2020-01-17 20:26 +0100
http://bitbucket.org/pypy/pypy/changeset/4d330d31b630/

Log:	switch to using CPython's bytecode number for CALL_METHOD

diff --git a/lib-python/3/opcode.py b/lib-python/3/opcode.py
--- a/lib-python/3/opcode.py
+++ b/lib-python/3/opcode.py
@@ -31,12 +31,10 @@
 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
@@ -216,12 +214,11 @@
 def_op('BUILD_STRING', 157)   # in CPython 3.6, but available in PyPy from 3.5
 
 #name_op('LOAD_METHOD', 160)
-#def_op('CALL_METHOD', 161)
+def_op('CALL_METHOD', 161)
 
 # pypy modification, experimental bytecode
 def_op('LOOKUP_METHOD', 201)          # Index in name list
 hasname.append(201)
-def_op('CALL_METHOD', 202)            # #args not including 'self'
 def_op('BUILD_LIST_FROM_ARG', 203)
 def_op('CALL_METHOD_KW', 204)
 def_op('LOAD_REVDB_VAR', 205)         # reverse debugger (syntax example: $5)

From pypy.commits at gmail.com  Fri Jan 17 15:33:54 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 12:33:54 -0800 (PST)
Subject: [pypy-commit] pypy py3.7-call-changes: tweaks
Message-ID: <5e221a32.1c69fb81.ccd54.26e8@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7-call-changes
Changeset: r98550:2fc71d7dffd6
Date: 2020-01-17 21:24 +0100
http://bitbucket.org/pypy/pypy/changeset/2fc71d7dffd6/

Log:	tweaks

diff --git a/lib-python/3/opcode.py b/lib-python/3/opcode.py
--- a/lib-python/3/opcode.py
+++ b/lib-python/3/opcode.py
@@ -173,8 +173,8 @@
 
 def_op('RAISE_VARARGS', 130)    # Number of raise arguments (1, 2, or 3)
 def_op('CALL_FUNCTION', 131)    # #args
-hasnargs.append(131)
-def_op('MAKE_FUNCTION', 132)    # Number of args with default values
+
+def_op('MAKE_FUNCTION', 132)    # Flags
 def_op('BUILD_SLICE', 133)      # Number of items
 def_op('LOAD_CLOSURE', 135)
 hasfree.append(135)
@@ -186,7 +186,7 @@
 hasfree.append(138)
 
 def_op('CALL_FUNCTION_KW', 141)  # #args + #kwargs
-hasnargs.append(141)
+
 def_op('CALL_FUNCTION_EX', 142)  # Flags
 
 jrel_op('SETUP_WITH', 143)
@@ -198,7 +198,6 @@
 def_op('LOAD_CLASSDEREF', 148)
 hasfree.append(148)
 
-jrel_op('SETUP_ASYNC_WITH', 154)
 
 def_op('EXTENDED_ARG', 144)
 EXTENDED_ARG = 144
@@ -209,9 +208,11 @@
 def_op('BUILD_TUPLE_UNPACK', 152)
 def_op('BUILD_SET_UNPACK', 153)
 
-def_op('FORMAT_VALUE', 155)   # in CPython 3.6, but available in PyPy from 3.5
+jrel_op('SETUP_ASYNC_WITH', 154)
+
+def_op('FORMAT_VALUE', 155)
 def_op('BUILD_CONST_KEY_MAP', 156)
-def_op('BUILD_STRING', 157)   # in CPython 3.6, but available in PyPy from 3.5
+def_op('BUILD_STRING', 157)
 
 #name_op('LOAD_METHOD', 160)
 def_op('CALL_METHOD', 161)

From pypy.commits at gmail.com  Fri Jan 17 15:33:55 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 12:33:55 -0800 (PST)
Subject: [pypy-commit] pypy py3.7-call-changes: close to-be-merged branch
Message-ID: <5e221a33.1c69fb81.e16a3.5297@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7-call-changes
Changeset: r98551:8673f4fe2657
Date: 2020-01-17 21:25 +0100
http://bitbucket.org/pypy/pypy/changeset/8673f4fe2657/

Log:	close to-be-merged branch


From pypy.commits at gmail.com  Fri Jan 17 15:33:58 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 12:33:58 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.7-call-changes
Message-ID: <5e221a36.1c69fb81.f31c4.1f83@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98552:f20ec1e0843b
Date: 2020-01-17 21:31 +0100
http://bitbucket.org/pypy/pypy/changeset/f20ec1e0843b/

Log:	merge py3.7-call-changes

	implement more faithfully the bytecodes that CPython 3.7 uses for
	calling functions

diff --git a/lib-python/3/opcode.py b/lib-python/3/opcode.py
--- a/lib-python/3/opcode.py
+++ b/lib-python/3/opcode.py
@@ -31,12 +31,10 @@
 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
@@ -174,11 +172,10 @@
 name_op('STORE_ANNOTATION', 127) # Index in name list XXX: removed in CPython 3.7
 
 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)
@@ -188,12 +185,9 @@
 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)
 
@@ -204,7 +198,6 @@
 def_op('LOAD_CLASSDEREF', 148)
 hasfree.append(148)
 
-jrel_op('SETUP_ASYNC_WITH', 154)
 
 def_op('EXTENDED_ARG', 144)
 EXTENDED_ARG = 144
@@ -215,18 +208,20 @@
 def_op('BUILD_TUPLE_UNPACK', 152)
 def_op('BUILD_SET_UNPACK', 153)
 
-def_op('FORMAT_VALUE', 155)   # in CPython 3.6, but available in PyPy from 3.5
+jrel_op('SETUP_ASYNC_WITH', 154)
+
+def_op('FORMAT_VALUE', 155)
 def_op('BUILD_CONST_KEY_MAP', 156)
-def_op('BUILD_STRING', 157)   # in CPython 3.6, but available in PyPy from 3.5
+def_op('BUILD_STRING', 157)
 
 #name_op('LOAD_METHOD', 160)
-#def_op('CALL_METHOD', 161)
+def_op('CALL_METHOD', 161)
 
 # pypy modification, experimental bytecode
 def_op('LOOKUP_METHOD', 201)          # Index in name list
 hasname.append(201)
-def_op('CALL_METHOD', 202)            # #args not including 'self'
 def_op('BUILD_LIST_FROM_ARG', 203)
+def_op('CALL_METHOD_KW', 204)
 def_op('LOAD_REVDB_VAR', 205)         # reverse debugger (syntax example: $5)
 
 del def_op, name_op, jrel_op, jabs_op
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -16,3 +16,8 @@
 .. branch: bpo-16055
 
 Fixes incorrect error text for ``int('1', base=1000)``
+
+.. branch py3.7-call-changes
+
+Implement the CPython 3.7 changes to the call bytecodes, including supporting
+more than 255 arguments.
diff --git a/pypy/interpreter/astcompiler/assemble.py b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -768,9 +768,6 @@
 def _compute_BUILD_MAP_UNPACK_WITH_CALL(arg):
     return 1 - (arg & 0xFF)
 
-def _compute_MAKE_CLOSURE(arg):
-    return -2 - _num_args(arg) - ((arg >> 16) & 0xFFFF)
-
 def _compute_MAKE_FUNCTION(arg):
     return -1 - bool(arg & 0x01) - bool(arg & 0x02) - bool(arg & 0x04) - bool(arg & 0x08)
 
@@ -783,23 +780,22 @@
 def _compute_RAISE_VARARGS(arg):
     return -arg
 
-def _num_args(oparg):
-    return (oparg % 256) + 2 * ((oparg // 256) % 256)
-
 def _compute_CALL_FUNCTION(arg):
-    return -_num_args(arg)
-
-def _compute_CALL_FUNCTION_VAR(arg):
-    return -_num_args(arg) - 1
+    return -arg
 
 def _compute_CALL_FUNCTION_KW(arg):
-    return -_num_args(arg) - 1
+    return -arg - 1
 
-def _compute_CALL_FUNCTION_VAR_KW(arg):
-    return -_num_args(arg) - 2
+def _compute_CALL_FUNCTION_EX(arg):
+    assert arg == 0 or arg == 1
+    # either -1 or -2
+    return -arg - 1
 
 def _compute_CALL_METHOD(arg):
-    return -_num_args(arg) - 1
+    return -arg - 1
+
+def _compute_CALL_METHOD_KW(arg):
+    return -arg - 2
 
 def _compute_FORMAT_VALUE(arg):
     if (arg & consts.FVS_MASK) == consts.FVS_HAVE_SPEC:
diff --git a/pypy/interpreter/astcompiler/astbuilder.py b/pypy/interpreter/astcompiler/astbuilder.py
--- a/pypy/interpreter/astcompiler/astbuilder.py
+++ b/pypy/interpreter/astcompiler/astbuilder.py
@@ -598,8 +598,6 @@
         kwdefaults = []
         kwarg = None
         vararg = None
-        if n_pos + n_kwdonly > 255:
-            self.error("more than 255 arguments", arguments_node)
         # process args
         i = 0
         have_default = False
@@ -1113,8 +1111,6 @@
                 (generator_count and (keyword_count or arg_count)):
             self.error("Generator expression must be parenthesized "
                        "if not sole argument", args_node)
-        if arg_count + keyword_count + generator_count > 255:
-            self.error("more than 255 arguments", args_node)
         args = []
         keywords = []
         used_keywords = {}
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -1412,99 +1412,20 @@
             self.load_const(self.space.newtext(keyword.arg))
         keyword.value.walkabout(self)
 
-    def _make_call(self, n, # args already pushed
-                   args, keywords):
-        call_type = 0
-        # the number of tuples and dictionaries on the stack
-        nsubargs = 0
-        nsubkwargs = 0
-        nkw = 0
-        nseen = 0 # the number of positional arguments on the stack
-        if args is not None:
-            for elt in args:
-                if isinstance(elt, ast.Starred):
-                    # A star-arg. If we've seen positional arguments,
-                    # pack the positional arguments into a tuple.
-                    if nseen:
-                        self.emit_op_arg(ops.BUILD_TUPLE, nseen)
-                        nseen = 0
-                        nsubargs += 1
-                    elt.value.walkabout(self)
-                    nsubargs += 1
-                elif nsubargs:
-                    # We've seen star-args already, so we
-                    # count towards items-to-pack-into-tuple.
-                    elt.walkabout(self)
-                    nseen += 1
-                else:
-                    # Positional arguments before star-arguments
-                    # are left on the stack.
-                    elt.walkabout(self)
-                    n += 1
-            if nseen:
-                # Pack up any trailing positional arguments.
-                self.emit_op_arg(ops.BUILD_TUPLE, nseen)
-                nsubargs += 1
-            if nsubargs:
-                call_type |= 1
-                if nsubargs > 1:
-                    # If we ended up with more than one stararg, we need
-                    # to concatenate them into a single sequence.
-                    self.emit_op_arg(ops.BUILD_LIST_UNPACK, nsubargs)
+    def _load_constant_tuple(self, content_w):
+        self.load_const(self.space.newtuple(content_w[:]))
 
-        # Repeat procedure for keyword args
-        nseen = 0 # the number of keyword arguments on the stack following
-        if keywords is not None:
-            for kw in keywords:
-                assert isinstance(kw, ast.keyword)
-                if kw.arg is None:
-                    # A keyword argument unpacking.
-                    if nseen:
-                        self.emit_op_arg(ops.BUILD_MAP, nseen)
-                        nseen = 0
-                        nsubkwargs += 1
-                    kw.value.walkabout(self)
-                    nsubkwargs += 1
-                elif nsubkwargs:
-                    # A keyword argument and we already have a dict.
-                    self.load_const(self.space.newtext(kw.arg))
-                    kw.value.walkabout(self)
-                    nseen += 1
-                else:
-                    # keyword argument
-                    kw.walkabout(self)
-                    nkw += 1
-            if nseen:
-                # Pack up any trailing keyword arguments.
-                self.emit_op_arg(ops.BUILD_MAP,nseen)
-                nsubkwargs += 1
-            if nsubkwargs:
-                call_type |= 2
-                if nsubkwargs > 1:
-                    # Pack it all up
-                    function_pos = n + (call_type & 1) + nkw + 1
-                    self.emit_op_arg(ops.BUILD_MAP_UNPACK_WITH_CALL, (nsubkwargs | (function_pos << 8)))
-
-        assert n < 1<<8
-        assert nkw < 1<<24
-        n |= nkw << 8;
-
-        op = 0
-        if call_type == 0:
-            op = ops.CALL_FUNCTION
-        elif call_type == 1:
-            op = ops.CALL_FUNCTION_VAR
-        elif call_type == 2:
-            op = ops.CALL_FUNCTION_KW
-        elif call_type == 3:
-            op = ops.CALL_FUNCTION_VAR_KW
-        self.emit_op_arg(op, n)
+    def _make_call(self, nargs_pushed, args, keywords):
+        space = self.space
+        CallCodeGenerator(self, nargs_pushed, args, keywords).emit_call()
 
     def visit_Call(self, call):
         self.update_position(call.lineno)
         if self._optimize_method_call(call):
             return
         call.func.walkabout(self)
+        #if getattr(call.func, "id", None) == "f":
+        #    import pdb; pdb.set_trace()
         self._make_call(0, call.args, call.keywords)
 
     def _call_has_no_star_args(self, call):
@@ -1523,6 +1444,7 @@
         return self._call_has_no_star_args(call) and not call.keywords
 
     def _optimize_method_call(self, call):
+        space = self.space
         if not self._call_has_no_star_args(call) or \
            not isinstance(call.func, ast.Attribute):
             return False
@@ -1532,9 +1454,18 @@
         self.emit_op_name(ops.LOOKUP_METHOD, self.names, attr_lookup.attr)
         self.visit_sequence(call.args)
         arg_count = len(call.args) if call.args is not None else 0
-        self.visit_sequence(call.keywords)
-        kwarg_count = len(call.keywords) if call.keywords is not None else 0
-        self.emit_op_arg(ops.CALL_METHOD, (kwarg_count << 8) | arg_count)
+        if not call.keywords:
+            self.emit_op_arg(ops.CALL_METHOD, arg_count)
+        else:
+            keyword_names_w = []
+            for kw in call.keywords:
+                assert isinstance(kw, ast.keyword)
+                assert kw.arg  # checked by self._call_has_no_star_args
+                w_name = space.newtext(kw.arg)
+                keyword_names_w.append(misc.intern_if_common_string(space, w_name))
+                kw.value.walkabout(self)
+            self._load_constant_tuple(keyword_names_w)
+            self.emit_op_arg(ops.CALL_METHOD_KW, len(keyword_names_w) + arg_count)
         return True
 
     def visit_ListComp(self, lc):
@@ -1946,3 +1877,127 @@
         if self.scope.doc_removable:
             flags |= consts.CO_KILL_DOCSTRING
         return PythonCodeGenerator._get_code_flags(self) | flags
+
+
+class CallCodeGenerator(object):
+    def __init__(self, codegenerator, nargs_pushed, args, keywords):
+        self.space = codegenerator.space
+        self.codegenerator = codegenerator
+        self.nargs_pushed = nargs_pushed
+        self.args = args
+        self.keywords = keywords
+
+        # the number of tuples and dictionaries on the stack
+        self.nsubargs = 0
+        self.nsubkwargs = 0
+        self.keyword_names_w = []
+
+    def _pack_positional_into_tuple(self):
+        if self.nargs_pushed:
+            self.codegenerator.emit_op_arg(ops.BUILD_TUPLE, self.nargs_pushed)
+            self.nsubargs += 1
+            self.nargs_pushed = 0
+
+    def _push_args(self):
+        for elt in self.args:
+            if isinstance(elt, ast.Starred):
+                # we have a *arg
+                self._pack_positional_into_tuple()
+                elt.value.walkabout(self.codegenerator)
+                self.nsubargs += 1
+                continue
+            if self.nargs_pushed >= MAX_STACKDEPTH_CONTAINERS // 2:
+                # stack depth getting too big
+                self._pack_positional_into_tuple()
+            elt.walkabout(self.codegenerator)
+            self.nargs_pushed += 1
+        if self.nsubargs:
+            # Pack up any trailing positional arguments.
+            self._pack_positional_into_tuple()
+            if self.nsubargs > 1:
+                # If we ended up with more than one stararg, we need
+                # to concatenate them into a single sequence.
+                # XXX CPython uses BUILD_TUPLE_UNPACK_WITH_CALL, but I
+                # don't quite see the difference?
+                self.codegenerator.emit_op_arg(ops.BUILD_TUPLE_UNPACK, self.nsubargs)
+
+    def _pack_kwargs_into_dict(self):
+        if self.keyword_names_w:
+            self.codegenerator._load_constant_tuple(self.keyword_names_w)
+            # XXX use BUILD_MAP for size 1?
+            self.codegenerator.emit_op_arg(ops.BUILD_CONST_KEY_MAP, len(self.keyword_names_w))
+            self.keyword_names_w = []
+            self.nsubkwargs += 1
+
+    def _push_kwargs(self):
+        for kw in self.keywords:
+            assert isinstance(kw, ast.keyword)
+            if kw.arg is None:
+                # if we see **args or if the number of keywords is huge,
+                # pack up keywords on the stack so far
+                self._pack_kwargs_into_dict()
+                kw.value.walkabout(self.codegenerator)
+                self.nsubkwargs += 1
+                continue
+            if len(self.keyword_names_w) > MAX_STACKDEPTH_CONTAINERS // 2:
+                self._pack_kwargs_into_dict()
+            w_name = self.space.newtext(kw.arg)
+            self.keyword_names_w.append(misc.intern_if_common_string(self.space, w_name))
+            kw.value.walkabout(self.codegenerator)
+        if self.nsubkwargs:
+            self._pack_kwargs_into_dict()
+            if self.nsubkwargs > 1:
+                # Pack it all up
+                self.codegenerator.emit_op_arg(ops.BUILD_MAP_UNPACK_WITH_CALL, self.nsubkwargs)
+
+    def _pack_positional_args_into_tuple(self):
+        if self.nargs_pushed == 0:
+            self.codegenerator._load_constant_tuple([])
+        else:
+            self.codegenerator.emit_op_arg(ops.BUILD_TUPLE, self.nargs_pushed)
+        self.nsubargs += 1
+
+    def _push_tuple_positional_args_if_necessary(self):
+        if self.nsubargs:
+            # can't use CALL_FUNCTION_KW anyway, because we already have a
+            # tuple as the positional args
+            return
+        # we might get away with using CALL_FUNCTION_KW if there are no **kwargs
+        for kw in self.keywords:
+            assert isinstance(kw, ast.keyword)
+            if kw.arg is None:
+                # we found a **kwarg, thus we're using CALL_FUNCTION_EX, we
+                # need to pack up positional arguments first
+                self._pack_positional_args_into_tuple()
+                break
+        if self.nsubargs == 0 and len(self.keywords) > MAX_STACKDEPTH_CONTAINERS // 2:
+            # we have a huge amount of keyword args, thus we also need to use
+            # CALL_FUNCTION_EX
+            self._pack_positional_args_into_tuple()
+
+    def emit_call(self):
+        keywords = self.keywords
+        codegenerator = self.codegenerator
+        space = self.space
+        if self.args is not None:
+            self._push_args()
+
+        # Repeat procedure for keyword args
+        if keywords is None or len(keywords) == 0:
+            if not self.nsubargs:
+                # no *args, no keyword args, no **kwargs
+                codegenerator.emit_op_arg(ops.CALL_FUNCTION, self.nargs_pushed)
+                return
+        else:
+            self._push_tuple_positional_args_if_necessary()
+            self._push_kwargs()
+
+        if self.nsubkwargs == 0 and self.nsubargs == 0:
+            # can use CALL_FUNCTION_KW
+            assert len(self.keyword_names_w) > 0 # otherwise we would have used CALL_FUNCTION
+            codegenerator._load_constant_tuple(self.keyword_names_w)
+            codegenerator.emit_op_arg(ops.CALL_FUNCTION_KW, self.nargs_pushed + len(self.keyword_names_w))
+        else:
+            self._pack_kwargs_into_dict()
+            codegenerator.emit_op_arg(ops.CALL_FUNCTION_EX, int(self.nsubkwargs > 0))
+
diff --git a/pypy/interpreter/astcompiler/test/test_astbuilder.py b/pypy/interpreter/astcompiler/test/test_astbuilder.py
--- a/pypy/interpreter/astcompiler/test/test_astbuilder.py
+++ b/pypy/interpreter/astcompiler/test/test_astbuilder.py
@@ -570,13 +570,13 @@
         for i in range(255):
             fundef += "i%d, "%i
         fundef += "*, key=100):\n pass\n"
-        pytest.raises(SyntaxError, self.get_first_stmt, fundef)
+        self.get_first_stmt(fundef) # no crash, works since 3.7
 
         fundef2 = "def foo(i,*,"
         for i in range(255):
             fundef2 += "i%d, "%i
         fundef2 += "lastarg):\n  pass\n"
-        pytest.raises(SyntaxError, self.get_first_stmt, fundef)
+        self.get_first_stmt(fundef2) # no crash, works since 3.7
 
         fundef3 = "def f(i,*,"
         for i in range(253):
@@ -1075,8 +1075,7 @@
             "sole argument"
         many_args = ", ".join("x%i" % i for i in range(256))
         input = "f(%s)" % (many_args,)
-        exc = pytest.raises(SyntaxError, self.get_ast, input).value
-        assert exc.msg == "more than 255 arguments"
+        self.get_ast(input) # doesn't crash any more
         exc = pytest.raises(SyntaxError, self.get_ast, "f((a+b)=c)").value
         assert exc.msg == "keyword can't be an expression"
         exc = pytest.raises(SyntaxError, self.get_ast, "f(a=c, a=d)").value
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -264,6 +264,57 @@
         yield self.st, decl + "x=f(5, b=2, **{'a': 8})", "x", [5, ('a', 8),
                                                                   ('b', 2)]
 
+    def test_funccalls_all_combinations(self):
+        decl = """
+def f(*args, **kwds):
+    kwds = sorted(kwds.items())
+    return list(args) + kwds
+
+class A:
+    def f(self, *args, **kwds):
+        kwds = sorted(kwds.items())
+        return ["meth"] + list(args) + kwds
+a = A()
+"""
+        allres = []
+        allcalls = []
+        for meth in [False, True]:
+            for starstarargs in [
+                    [],
+                    [[('x', 1), ('y', 12)]],
+                    [[('w1', 1), ('w2', 12)], [('x1', 1), ('x2', -12)], [('y1', 10), ('y2', 123)]]
+                    ]:
+                for starargs in [[], [(2, 3)], [(2, 3), (4, 19), (23, 54, 123)]]:
+                    for kwargs in [[], [('m', 1)], [('n', 1), ('o', 2), ('p', 3)]]:
+                        for args in [(), (1, ), (1, 4, 5)]:
+                            if not meth:
+                                call = "f("
+                                res = []
+                            else:
+                                call = "a.f("
+                                res = ["meth"]
+                            if args:
+                                call += ", ".join(str(arg) for arg in args) + ","
+                                res.extend(args)
+                            if starargs:
+                                for stararg in starargs:
+                                    call += "*" + str(stararg) + ","
+                                    res.extend(stararg)
+                            if kwargs:
+                                call += ", ".join("%s=%s" % (kw, arg) for (kw, arg) in kwargs) + ", "
+                                res.extend(kwargs)
+                            if starstarargs:
+                                for starstar in starstarargs:
+                                    call += "**dict(%s)" % starstar + ","
+                                res.extend(sum(starstarargs, []))
+                            call += ")"
+                            allcalls.append(call)
+                            allres.append(res)
+                            print call
+                            print res
+        self.st(decl + "x=[" + "\n,".join(allcalls) + "]", "x", allres)
+
+
     def test_kwonly(self):
         decl = py.code.Source("""
             def f(a, *, b):
@@ -1276,6 +1327,24 @@
             x = [y for (x, y) in dis.findlinestarts(co)]
         """, 'x', [4]
 
+    def test_many_args(self):
+        args = ["a%i" % i for i in range(300)]
+        argdef = ", ".join(args)
+        res = "+".join(args)
+        callargs = ", ".join(str(i) for i in range(300))
+
+        source1 = """def f(%s):
+            return %s
+x = f(%s)
+        """ % (argdef, res, callargs)
+        source2 = """def f(%s):
+            return %s
+x = f(*(%s))
+        """ % (argdef, res, callargs)
+
+        yield self.simple_test, source1, 'x', sum(range(300))
+        yield self.simple_test, source2, 'x', sum(range(300))
+
 
 class TestCompilerRevDB(BaseTestCompiler):
     spaceconfig = {"translation.reverse_debugger": True}
@@ -1611,6 +1680,39 @@
         counts = self.count_instructions(source)
         assert counts[ops.BUILD_TUPLE] == 1
 
+    def test_call_bytecodes(self):
+        # check that the expected bytecodes are generated
+        source = """def f(): x(a, b, c)"""
+        counts = self.count_instructions(source)
+        assert counts[ops.CALL_FUNCTION] == 1
+
+        source = """def f(): x(a, b, c, x=1, y=2)"""
+        counts = self.count_instructions(source)
+        assert counts[ops.CALL_FUNCTION_KW] == 1
+
+        source = """def f(): x(a, b, c, *(d, 2), x=1, y=2)"""
+        counts = self.count_instructions(source)
+        assert counts[ops.BUILD_TUPLE] == 2
+        assert counts[ops.BUILD_TUPLE_UNPACK] == 1
+        assert counts[ops.CALL_FUNCTION_EX] == 1
+
+        source = """def f(): x(a, b, c, **kwargs)"""
+        counts = self.count_instructions(source)
+        assert counts[ops.BUILD_TUPLE] == 1
+        assert counts[ops.CALL_FUNCTION_EX] == 1
+
+        source = """def f(): x(**kwargs)"""
+        counts = self.count_instructions(source)
+        assert ops.BUILD_TUPLE not in counts # LOAD_CONST used instead
+        assert counts[ops.CALL_FUNCTION_EX] == 1
+
+        source = """def f(): x.m(a, b, c)"""
+        counts = self.count_instructions(source)
+        assert counts[ops.CALL_METHOD] == 1
+
+        source = """def f(): x.m(a, b, c, y=1)"""
+        counts = self.count_instructions(source)
+        assert counts[ops.CALL_METHOD_KW] == 1
 
 class TestHugeStackDepths:
     def run_and_check_stacksize(self, source):
@@ -1653,3 +1755,12 @@
         source = "{" + ",".join(['%s: None' % (i, ) for i in range(200)]) + "}\n"
         w_res = self.run_and_check_stacksize(source)
         assert self.space.unwrap(w_res) == dict.fromkeys(range(200))
+
+    def test_callargs(self):
+        source = "(lambda *args: args)(" + ", ".join([str(i) for i in range(200)]) + ")\n"
+        w_res = self.run_and_check_stacksize(source)
+        assert self.space.unwrap(w_res) == tuple(range(200))
+
+        source = "(lambda **args: args)(" + ", ".join(["s%s=None" % i for i in range(200)]) + ")\n"
+        w_res = self.run_and_check_stacksize(source)
+        assert self.space.unwrap(w_res) == dict.fromkeys(["s" + str(i) for i in range(200)])
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -38,7 +38,7 @@
 # time you make pyc files incompatible.  This value ends up in the frozen
 # importlib, via MAGIC_NUMBER in module/_frozen_importlib/__init__.
 
-pypy_incremental_magic = 208 # bump it by 16
+pypy_incremental_magic = 224 # bump it by 16
 assert pypy_incremental_magic % 16 == 0
 assert pypy_incremental_magic < 3000 # the magic number of Python 3. There are
                                      # no known magic numbers below this value
diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -504,6 +504,7 @@
         """ Returns 'funcname()' from either a function name fnname or a
         wrapped callable w_function. If it's not a function or a method, returns
         'Classname object'"""
+        # XXX this is super annoying to compute every time we do a function call!
         # CPython has a similar function, PyEval_GetFuncName
         from pypy.interpreter.function import Function, Method
         if fnname is not None:
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -273,12 +273,12 @@
                 self.CALL_FUNCTION(oparg, next_instr)
             elif opcode == opcodedesc.CALL_FUNCTION_KW.index:
                 self.CALL_FUNCTION_KW(oparg, next_instr)
-            elif opcode == opcodedesc.CALL_FUNCTION_VAR.index:
-                self.CALL_FUNCTION_VAR(oparg, next_instr)
-            elif opcode == opcodedesc.CALL_FUNCTION_VAR_KW.index:
-                self.CALL_FUNCTION_VAR_KW(oparg, next_instr)
+            elif opcode == opcodedesc.CALL_FUNCTION_EX.index:
+                self.CALL_FUNCTION_EX(oparg, next_instr)
             elif opcode == opcodedesc.CALL_METHOD.index:
                 self.CALL_METHOD(oparg, next_instr)
+            elif opcode == opcodedesc.CALL_METHOD_KW.index:
+                self.CALL_METHOD_KW(oparg, next_instr)
             elif opcode == opcodedesc.COMPARE_OP.index:
                 self.COMPARE_OP(oparg, next_instr)
             elif opcode == opcodedesc.DELETE_ATTR.index:
@@ -1339,31 +1339,54 @@
         self.pushvalue(w_result)
 
     def CALL_FUNCTION(self, oparg, next_instr):
-        # XXX start of hack for performance
-        if (oparg >> 8) & 0xff == 0:
-            # Only positional arguments
-            nargs = oparg & 0xff
-            w_function = self.peekvalue(nargs)
-            try:
-                w_result = self.space.call_valuestack(w_function, nargs, self)
-            finally:
-                self.dropvalues(nargs + 1)
-            self.pushvalue(w_result)
-        # XXX end of hack for performance
+        # Only positional arguments
+        nargs = oparg & 0xff
+        w_function = self.peekvalue(nargs)
+        try:
+            w_result = self.space.call_valuestack(w_function, nargs, self)
+        finally:
+            self.dropvalues(nargs + 1)
+        self.pushvalue(w_result)
+
+    @jit.unroll_safe
+    def CALL_FUNCTION_KW(self, n_arguments, next_instr):
+        w_tup_varnames = self.popvalue()
+        keywords_w = self.space.fixedview(w_tup_varnames)
+        n_keywords = len(keywords_w)
+        n_arguments -= n_keywords
+        keywords = [self.space.text_w(w_keyword) for w_keyword in keywords_w]
+        keywords_w = [None] * n_keywords
+        while True:
+            n_keywords -= 1
+            if n_keywords < 0:
+                break
+            w_value = self.popvalue()
+            keywords_w[n_keywords] = w_value
+        arguments = self.popvalues(n_arguments)
+        w_function  = self.popvalue()
+        args = self.argument_factory(arguments, keywords, keywords_w, None, None,
+                                     w_function=w_function)
+        if self.get_is_being_profiled() and function.is_builtin_code(w_function):
+            w_result = self.space.call_args_and_c_profile(self, w_function,
+                                                          args)
         else:
-            # general case
-            self.call_function(oparg)
+            w_result = self.space.call_args(w_function, args)
+        self.pushvalue(w_result)
 
-    def CALL_FUNCTION_VAR(self, oparg, next_instr):
-        self.call_function(oparg, has_vararg=True)
-
-    def CALL_FUNCTION_KW(self, oparg, next_instr):
-        w_varkw = self.popvalue()
-        self.call_function(oparg, w_varkw)
-
-    def CALL_FUNCTION_VAR_KW(self, oparg, next_instr):
-        w_varkw = self.popvalue()
-        self.call_function(oparg, w_varkw, has_vararg=True)
+    def CALL_FUNCTION_EX(self, has_kwarg, next_instr):
+        w_kwargs = None
+        if has_kwarg:
+            w_kwargs = self.popvalue()
+        w_args = self.popvalue()
+        w_function = self.popvalue()
+        args = self.argument_factory(
+            [], None, None, w_star=w_args, w_starstar=w_kwargs, w_function=w_function)
+        if self.get_is_being_profiled() and function.is_builtin_code(w_function):
+            w_result = self.space.call_args_and_c_profile(self, w_function,
+                                                          args)
+        else:
+            w_result = self.space.call_args(w_function, args)
+        self.pushvalue(w_result)
 
     @jit.unroll_safe
     def MAKE_FUNCTION(self, oparg, next_instr):
@@ -1436,6 +1459,7 @@
     # overridden by faster version in the standard object space.
     LOOKUP_METHOD = LOAD_ATTR
     CALL_METHOD = CALL_FUNCTION
+    CALL_METHOD_KW = CALL_FUNCTION_KW
 
     def MISSING_OPCODE(self, oparg, next_instr):
         ofs = self.last_instr
@@ -1489,30 +1513,29 @@
         self.pushvalue(w_set)
 
     @jit.unroll_safe
-    def list_unpack_helper(frame, itemcount):
-        space = frame.space
-        w_sum = space.newlist([], sizehint=itemcount)
-        for i in range(itemcount, 0, -1):
-            w_item = frame.peekvalue(i-1)
-            w_sum.extend(w_item)
-        frame.popvalues(itemcount)
-        return w_sum
+    def BUILD_TUPLE_UNPACK(self, itemcount, next_instr):
+        l = []
+        for i in range(itemcount-1, -1, -1):
+            w_item = self.peekvalue(i)
+            l.extend(self.space.fixedview(w_item))
+        self.popvalues(itemcount)
+        self.pushvalue(self.space.newtuple(l[:]))
 
     @jit.unroll_safe
-    def BUILD_TUPLE_UNPACK(self, itemcount, next_instr):
-        w_list = self.list_unpack_helper(itemcount)
-        items = [w_obj for w_obj in w_list.getitems_unroll()]
-        self.pushvalue(self.space.newtuple(items))
-
     def BUILD_LIST_UNPACK(self, itemcount, next_instr):
-        w_sum = self.list_unpack_helper(itemcount)
+        space = self.space
+        w_sum = space.newlist([], sizehint=itemcount)
+        for i in range(itemcount-1, -1, -1):
+            w_item = self.peekvalue(i)
+            w_sum.extend(w_item)
+        self.popvalues(itemcount)
         self.pushvalue(w_sum)
 
     def BUILD_MAP_UNPACK(self, itemcount, next_instr):
         self._build_map_unpack(itemcount, with_call=False)
 
     def BUILD_MAP_UNPACK_WITH_CALL(self, oparg, next_instr):
-        num_maps = oparg & 0xff
+        num_maps = oparg # XXX CPython generates better error messages
         self._build_map_unpack(num_maps, with_call=True)
 
     @jit.unroll_safe
diff --git a/pypy/objspace/std/callmethod.py b/pypy/objspace/std/callmethod.py
--- a/pypy/objspace/std/callmethod.py
+++ b/pypy/objspace/std/callmethod.py
@@ -85,42 +85,47 @@
 @jit.unroll_safe
 def CALL_METHOD(f, oparg, *ignored):
     # opargs contains the arg, and kwarg count, excluding the implicit 'self'
-    n_args = oparg & 0xff
-    n_kwargs = (oparg >> 8) & 0xff
-    w_self = f.peekvalue_maybe_none(n_args + (2 * n_kwargs))
+    n_args = oparg
+    w_self = f.peekvalue_maybe_none(n_args)
     n = n_args + (w_self is not None)
 
-    if not n_kwargs:
-        w_callable = f.peekvalue(n_args + (2 * n_kwargs) + 1)
-        try:
-            w_result = f.space.call_valuestack(
-                    w_callable, n, f, methodcall=w_self is not None)
-        finally:
-            f.dropvalues(n_args + 2)
+    w_callable = f.peekvalue(n_args + 1)
+    try:
+        w_result = f.space.call_valuestack(
+                w_callable, n, f, methodcall=w_self is not None)
+    finally:
+        f.dropvalues(n_args + 2)
+    f.pushvalue(w_result)
+
+ at jit.unroll_safe
+def CALL_METHOD_KW(f, n_arguments, *ignored):
+    # opargs contains the arg + kwarg count, excluding the implicit 'self'
+    w_self = f.peekvalue_maybe_none(n_arguments + 1)
+    w_tup_varnames = f.popvalue()
+    keywords_w = f.space.fixedview(w_tup_varnames)
+    n_keywords = len(keywords_w)
+    n_arguments -= n_keywords
+    n = n_arguments + (w_self is not None)
+    keywords = [f.space.text_w(w_keyword) for w_keyword in keywords_w]
+    keywords_w = [None] * n_keywords
+    while True:
+        n_keywords -= 1
+        if n_keywords < 0:
+            break
+        w_value = f.popvalue()
+        keywords_w[n_keywords] = w_value
+
+    arguments = f.popvalues(n)    # includes w_self if it is not None
+    if w_self is None:
+        f.popvalue_maybe_none()    # removes w_self, which is None
+    w_callable = f.popvalue()
+    args = f.argument_factory(
+            arguments, keywords, keywords_w, None, None,
+            methodcall=w_self is not None, w_function=w_callable)
+    if f.get_is_being_profiled() and function.is_builtin_code(w_callable):
+        w_result = f.space.call_args_and_c_profile(f, w_callable, args)
     else:
-        keywords = [None] * n_kwargs
-        keywords_w = [None] * n_kwargs
-        while True:
-            n_kwargs -= 1
-            if n_kwargs < 0:
-                break
-            w_value = f.popvalue()
-            w_key = f.popvalue()
-            key = f.space.text_w(w_key)
-            keywords[n_kwargs] = key
-            keywords_w[n_kwargs] = w_value
-
-        arguments = f.popvalues(n)    # includes w_self if it is not None
-        if w_self is None:
-            f.popvalue_maybe_none()    # removes w_self, which is None
-        w_callable = f.popvalue()
-        args = f.argument_factory(
-                arguments, keywords, keywords_w, None, None,
-                methodcall=w_self is not None, w_function=w_callable)
-        if f.get_is_being_profiled() and function.is_builtin_code(w_callable):
-            w_result = f.space.call_args_and_c_profile(f, w_callable, args)
-        else:
-            w_result = f.space.call_args(w_callable, args)
+        w_result = f.space.call_args(w_callable, args)
     f.pushvalue(w_result)
 
 
diff --git a/pypy/objspace/std/frame.py b/pypy/objspace/std/frame.py
--- a/pypy/objspace/std/frame.py
+++ b/pypy/objspace/std/frame.py
@@ -85,7 +85,8 @@
         StdObjSpaceFrame.INPLACE_SUBTRACT = int_INPLACE_SUBTRACT
     if space.config.objspace.std.optimized_list_getitem:
         StdObjSpaceFrame.BINARY_SUBSCR = list_BINARY_SUBSCR
-    from pypy.objspace.std.callmethod import LOOKUP_METHOD, CALL_METHOD
+    from pypy.objspace.std.callmethod import LOOKUP_METHOD, CALL_METHOD, CALL_METHOD_KW
     StdObjSpaceFrame.LOOKUP_METHOD = LOOKUP_METHOD
     StdObjSpaceFrame.CALL_METHOD = CALL_METHOD
+    StdObjSpaceFrame.CALL_METHOD_KW = CALL_METHOD_KW
     return StdObjSpaceFrame
diff --git a/pypy/tool/opcode3.py b/pypy/tool/opcode3.py
--- a/pypy/tool/opcode3.py
+++ b/pypy/tool/opcode3.py
@@ -39,6 +39,7 @@
 del op
 
 def def_op(name, op):
+    assert op not in opname
     opname[op] = name
     opmap[name] = op
 
@@ -173,11 +174,10 @@
 haslocal.append(126)
 
 def_op('RAISE_VARARGS', 130)    # Number of raise arguments (1, 2, or 3)
-def_op('CALL_FUNCTION', 131)    # #args + (#kwargs << 8)
+def_op('CALL_FUNCTION', 131)    # #args
 hasnargs.append(131)
 def_op('MAKE_FUNCTION', 132)    # Number of args with default values
 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 +187,9 @@
 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)
+def_op('CALL_FUNCTION_KW', 141)  # #args + #kwargs
 hasnargs.append(141)
-def_op('CALL_FUNCTION_VAR_KW', 142)  # #args + (#kwargs << 8)
-hasnargs.append(142)
+def_op('CALL_FUNCTION_EX', 142)  # Flags
 
 jrel_op('SETUP_WITH', 143)
 
@@ -223,6 +220,7 @@
 hasname.append(201)
 def_op('CALL_METHOD', 202)            # #args not including 'self'
 def_op('BUILD_LIST_FROM_ARG', 203)
+def_op('CALL_METHOD_KW', 204)
 
 name_op('LOAD_METHOD', 160)
 def_op('CALL_METHOD', 161)

From pypy.commits at gmail.com  Fri Jan 17 16:05:59 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 13:05:59 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: re-implement BUILD_LIST_FROM_ARG in PyPy3
Message-ID: <5e2221b7.1c69fb81.38a59.3ee7@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98553:193b979f5bec
Date: 2020-01-17 22:04 +0100
http://bitbucket.org/pypy/pypy/changeset/193b979f5bec/

Log:	re-implement BUILD_LIST_FROM_ARG in PyPy3

	(the comment explaining why it was hard is bogus: iterators have
	__length_hint__ too)

diff --git a/pypy/TODO b/pypy/TODO
--- a/pypy/TODO
+++ b/pypy/TODO
@@ -3,10 +3,4 @@
 * run coverage against the parser/astbuilder/astcompiler: it's probably full of
 dead code because the grammar changed
 
-* optimize W_UnicodeObject, right now it stores both an unicode and an utf8
-version of the same string
-
-* re-enable BUILD_LIST_FROM_ARG: see the comment in astcompiler/codegen.py in
-ast.ListComp.build_container
-
 * review use of std_decode_utf8, we probably do not want to be using it
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -111,8 +111,8 @@
 
 class __extend__(ast.GeneratorExp):
 
-    def build_container(self, codegen):
-        pass
+    def build_container_and_load_iter(self, codegen):
+        codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -125,12 +125,18 @@
 
 class __extend__(ast.ListComp):
 
-    def build_container(self, codegen):
-        # XXX: this is suboptimal: if we use BUILD_LIST_FROM_ARG it's faster
-        # because it preallocates the list; however, we cannot use it because
-        # at this point we only have the iterator, not the original iterable
-        # object
-        codegen.emit_op_arg(ops.BUILD_LIST, 0)
+    def build_container_and_load_iter(self, codegen):
+        single = False
+        if len(self.generators) == 1:
+            gen, = self.generators
+            if not gen.ifs:
+                single = True
+        if single:
+            codegen.comprehension_load_iter()
+            codegen.emit_op(ops.BUILD_LIST_FROM_ARG)
+        else:
+            codegen.emit_op_arg(ops.BUILD_LIST, 0)
+            codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -142,8 +148,9 @@
 
 class __extend__(ast.SetComp):
 
-    def build_container(self, codegen):
+    def build_container_and_load_iter(self, codegen):
         codegen.emit_op_arg(ops.BUILD_SET, 0)
+        codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -155,8 +162,9 @@
 
 class __extend__(ast.DictComp):
 
-    def build_container(self, codegen):
+    def build_container_and_load_iter(self, codegen):
         codegen.emit_op_arg(ops.BUILD_MAP, 0)
+        codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -1555,10 +1563,7 @@
         anchor = self.new_block()
         gen = generators[gen_index]
         assert isinstance(gen, ast.comprehension)
-        if gen_index == 0:
-            self.argcount = 1
-            self.emit_op_arg(ops.LOAD_FAST, 0)
-        else:
+        if gen_index > 0:
             gen.iter.walkabout(self)
             self.emit_op(ops.GET_ITER)
         self.use_next_block(start)
@@ -1588,10 +1593,7 @@
         b_anchor = self.new_block()
         gen = generators[gen_index]
         assert isinstance(gen, ast.comprehension)
-        if gen_index == 0:
-            self.argcount = 1
-            self.emit_op_arg(ops.LOAD_FAST, 0)
-        else:
+        if gen_index > 0:
             gen.iter.walkabout(self)
             self.emit_op(ops.GET_AITER)
             self.load_const(self.space.w_None)
@@ -1888,12 +1890,16 @@
 class ComprehensionCodeGenerator(AbstractFunctionCodeGenerator):
 
     def _compile(self, node):
+        self.argcount = 1
         assert isinstance(node, ast.expr)
         self.update_position(node.lineno)
-        node.build_container(self)
+        node.build_container_and_load_iter(self)
         self._comp_generator(node, node.get_generators(), 0)
         self._end_comp()
 
+    def comprehension_load_iter(self):
+        self.emit_op_arg(ops.LOAD_FAST, 0)
+
     def _end_comp(self):
         self.emit_op(ops.RETURN_VALUE)
 
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1318,15 +1318,24 @@
     # BUILD_LIST_FROM_ARG is PyPy specific
     @py.test.mark.skipif('config.option.runappdirect')
     def test_build_list_from_arg_length_hint(self):
-        py3k_skip('XXX: BUILD_LIST_FROM_ARG list comps are genexps on py3k')
         hint_called = [False]
         class Foo(object):
+            def __iter__(self):
+                return FooIter()
+        class FooIter:
+            def __init__(self):
+                self.i = 0
             def __length_hint__(self):
                 hint_called[0] = True
                 return 5
             def __iter__(self):
-                for i in range(5):
-                    yield i
+                return self
+            def __next__(self):
+                if self.i < 5:
+                    res = self.i
+                    self.i += 1
+                    return res
+                raise StopIteration
         l = [a for a in Foo()]
         assert hint_called[0]
         assert l == list(range(5))

From pypy.commits at gmail.com  Fri Jan 17 16:54:53 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 13:54:53 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.6
Message-ID: <5e222d2d.1c69fb81.b35cb.3e7e@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98554:7212fc31582b
Date: 2020-01-17 22:23 +0100
http://bitbucket.org/pypy/pypy/changeset/7212fc31582b/

Log:	merge py3.6

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 all: pypy-c cffi_imports
 
 PYPY_EXECUTABLE := $(shell which pypy)
-URAM := $(shell python -c "import sys; print 4.5 if sys.maxint>1<<32 else 2.5")
 
 ifeq ($(PYPY_EXECUTABLE),)
 RUNINTERP = python
@@ -10,6 +9,8 @@
 RUNINTERP = $(PYPY_EXECUTABLE)
 endif
 
+URAM := $(shell $(RUNINTERP) -c "import sys; print 4.5 if sys.maxint>1<<32 else 2.5")
+
 .PHONY: pypy-c cffi_imports
 
 pypy-c:
diff --git a/pypy/TODO b/pypy/TODO
--- a/pypy/TODO
+++ b/pypy/TODO
@@ -3,10 +3,4 @@
 * run coverage against the parser/astbuilder/astcompiler: it's probably full of
 dead code because the grammar changed
 
-* optimize W_UnicodeObject, right now it stores both an unicode and an utf8
-version of the same string
-
-* re-enable BUILD_LIST_FROM_ARG: see the comment in astcompiler/codegen.py in
-ast.ListComp.build_container
-
 * review use of std_decode_utf8, we probably do not want to be using it
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -111,8 +111,8 @@
 
 class __extend__(ast.GeneratorExp):
 
-    def build_container(self, codegen):
-        pass
+    def build_container_and_load_iter(self, codegen):
+        codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -125,12 +125,18 @@
 
 class __extend__(ast.ListComp):
 
-    def build_container(self, codegen):
-        # XXX: this is suboptimal: if we use BUILD_LIST_FROM_ARG it's faster
-        # because it preallocates the list; however, we cannot use it because
-        # at this point we only have the iterator, not the original iterable
-        # object
-        codegen.emit_op_arg(ops.BUILD_LIST, 0)
+    def build_container_and_load_iter(self, codegen):
+        single = False
+        if len(self.generators) == 1:
+            gen, = self.generators
+            if not gen.ifs:
+                single = True
+        if single:
+            codegen.comprehension_load_iter()
+            codegen.emit_op(ops.BUILD_LIST_FROM_ARG)
+        else:
+            codegen.emit_op_arg(ops.BUILD_LIST, 0)
+            codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -142,8 +148,9 @@
 
 class __extend__(ast.SetComp):
 
-    def build_container(self, codegen):
+    def build_container_and_load_iter(self, codegen):
         codegen.emit_op_arg(ops.BUILD_SET, 0)
+        codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -155,8 +162,9 @@
 
 class __extend__(ast.DictComp):
 
-    def build_container(self, codegen):
+    def build_container_and_load_iter(self, codegen):
         codegen.emit_op_arg(ops.BUILD_MAP, 0)
+        codegen.comprehension_load_iter()
 
     def get_generators(self):
         return self.generators
@@ -1486,10 +1494,7 @@
         anchor = self.new_block()
         gen = generators[gen_index]
         assert isinstance(gen, ast.comprehension)
-        if gen_index == 0:
-            self.argcount = 1
-            self.emit_op_arg(ops.LOAD_FAST, 0)
-        else:
+        if gen_index > 0:
             gen.iter.walkabout(self)
             self.emit_op(ops.GET_ITER)
         self.use_next_block(start)
@@ -1519,10 +1524,7 @@
         b_anchor = self.new_block()
         gen = generators[gen_index]
         assert isinstance(gen, ast.comprehension)
-        if gen_index == 0:
-            self.argcount = 1
-            self.emit_op_arg(ops.LOAD_FAST, 0)
-        else:
+        if gen_index > 0:
             gen.iter.walkabout(self)
             self.emit_op(ops.GET_AITER)
             self.load_const(self.space.w_None)
@@ -1819,12 +1821,16 @@
 class ComprehensionCodeGenerator(AbstractFunctionCodeGenerator):
 
     def _compile(self, node):
+        self.argcount = 1
         assert isinstance(node, ast.expr)
         self.update_position(node.lineno)
-        node.build_container(self)
+        node.build_container_and_load_iter(self)
         self._comp_generator(node, node.get_generators(), 0)
         self._end_comp()
 
+    def comprehension_load_iter(self):
+        self.emit_op_arg(ops.LOAD_FAST, 0)
+
     def _end_comp(self):
         self.emit_op(ops.RETURN_VALUE)
 
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1387,15 +1387,24 @@
     # BUILD_LIST_FROM_ARG is PyPy specific
     @py.test.mark.skipif('config.option.runappdirect')
     def test_build_list_from_arg_length_hint(self):
-        py3k_skip('XXX: BUILD_LIST_FROM_ARG list comps are genexps on py3k')
         hint_called = [False]
         class Foo(object):
+            def __iter__(self):
+                return FooIter()
+        class FooIter:
+            def __init__(self):
+                self.i = 0
             def __length_hint__(self):
                 hint_called[0] = True
                 return 5
             def __iter__(self):
-                for i in range(5):
-                    yield i
+                return self
+            def __next__(self):
+                if self.i < 5:
+                    res = self.i
+                    self.i += 1
+                    return res
+                raise StopIteration
         l = [a for a in Foo()]
         assert hint_called[0]
         assert l == list(range(5))
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -263,6 +263,7 @@
             dict_w[name] = w_descr
             i += 1
 
+WARN_MISSING_SLOTS = False
 missing_slots={}
 def warn_missing_slot(space, method_name, slot_name, w_type):
     if not we_are_translated():
@@ -289,7 +290,8 @@
 
         if not slot_func_helper:
             if not slot_apifunc:
-                warn_missing_slot(space, method_name, slot_name, w_type)
+                if WARN_MISSING_SLOTS:
+                    warn_missing_slot(space, method_name, slot_name, w_type)
                 continue
             slot_func_helper = slot_apifunc.get_llhelper(space)
         fill_slot(space, pto, w_type, slot_names, slot_func_helper)
diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -77,10 +77,18 @@
     c_flock = external('flock', [rffi.INT, rffi.INT], rffi.INT,
                        save_err=rffi.RFFI_SAVE_ERRNO)
 
-def _get_error(space, funcname):
+def _raise_error_maybe(space, funcname):
+    # wrap_oserror(..., eintr_retry=True) raises an OSError or returns None
+    # when appropriate
     errno = rposix.get_saved_errno()
-    return wrap_oserror(space, OSError(errno, funcname),
-                        exception_name = 'w_IOError', eintr_retry=True)
+    wrap_oserror(space, OSError(errno, funcname),
+                 exception_name = 'w_IOError', eintr_retry=True)
+
+def _raise_error_always(space, funcname):
+    # this variant never returns normally, and doesn't retry if it gets EINTR.
+    errno = rposix.get_saved_errno()
+    raise wrap_oserror(space, OSError(errno, funcname),
+                       exception_name = 'w_IOError', eintr_retry=False)
 
 @unwrap_spec(op=int, w_arg=WrappedDefault(0))
 def fcntl(space, w_fd, op, w_arg):
@@ -109,7 +117,7 @@
             while True:
                 rv = fcntl_str(fd, op, ll_arg)
                 if rv < 0:
-                    _get_error(space, "fcntl")
+                    _raise_error_maybe(space, "fcntl")
                 else:
                     arg = rffi.charpsize2str(ll_arg, len(arg))
                     return space.newbytes(arg)
@@ -119,7 +127,7 @@
     while True:
         rv = fcntl_int(fd, op, intarg)
         if rv < 0:
-            _get_error(space, "fcntl")
+            _raise_error_maybe(space, "fcntl")
         else:
             return space.newint(rv)
 
@@ -137,7 +145,7 @@
         while True:
             rv = c_flock(fd, op)
             if rv < 0:
-                _get_error(space, "flock")
+                _raise_error_maybe(space, "flock")
             else:
                 return
     else:
@@ -191,7 +199,7 @@
         while True:
             rv = fcntl_flock(fd, op, l)
             if rv < 0:
-                _get_error(space, "fcntl")
+                _raise_error_maybe(space, "fcntl")
             else:
                 return
 
@@ -229,7 +237,7 @@
                               rffi.cast(rffi.VOIDP, ll_arg), len(arg))
                 rv = ioctl_str(fd, op, buf.raw)
                 if rv < 0:
-                    raise _get_error(space, "ioctl")
+                    _raise_error_always(space, "ioctl")
                 arg = rffi.charpsize2str(buf.raw, len(arg))
                 if mutate_flag != 0:
                     rwbuffer.setslice(0, arg)
@@ -257,7 +265,7 @@
                               rffi.cast(rffi.VOIDP, ll_arg), len(arg))
                 rv = ioctl_str(fd, op, buf.raw)
                 if rv < 0:
-                    raise _get_error(space, "ioctl")
+                    _raise_error_always(space, "ioctl")
                 arg = rffi.charpsize2str(buf.raw, len(arg))
             return space.newbytes(arg)
         finally:
@@ -267,5 +275,5 @@
     intarg = rffi.cast(rffi.INT, intarg)   # C long => C int
     rv = ioctl_int(fd, op, intarg)
     if rv < 0:
-        raise _get_error(space, "ioctl")
+        _raise_error_always(space, "ioctl")
     return space.newint(rv)
diff --git a/rpython/rtyper/debug.py b/rpython/rtyper/debug.py
--- a/rpython/rtyper/debug.py
+++ b/rpython/rtyper/debug.py
@@ -32,6 +32,12 @@
         return s_x.nonnoneify()
 
     def specialize_call(self, hop):
+        from rpython.annotator import model as annmodel
+        from rpython.rtyper.error import TyperError
+        if annmodel.s_None.contains(hop.args_s[0]):
+            raise TyperError("ll_assert_not_none(None) detected.  This might "
+                             "come from something that annotates as "
+                             "'raise None'.")
         [v0] = hop.inputargs(hop.args_r[0])
         hop.exception_cannot_occur()
         hop.genop('debug_assert_not_none', [v0])
diff --git a/rpython/rtyper/test/test_exception.py b/rpython/rtyper/test/test_exception.py
--- a/rpython/rtyper/test/test_exception.py
+++ b/rpython/rtyper/test/test_exception.py
@@ -3,7 +3,7 @@
 from rpython.translator.translator import TranslationContext
 from rpython.rtyper.test.tool import BaseRtypingTest
 from rpython.rtyper.llinterp import LLException
-from rpython.rtyper.error import MissingRTypeOperation
+from rpython.rtyper.error import MissingRTypeOperation, TyperError
 
 
 class MyException(Exception):
@@ -164,3 +164,10 @@
             except OverflowError:
                 return 42
         py.test.raises(MissingRTypeOperation, self.interpret, f, [])
+
+    def test_cannot_raise_something_annotated_as_none(self):
+        def g():
+            return None
+        def f():
+            raise g()
+        py.test.raises(TyperError, rtype, f)
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -218,6 +218,10 @@
             fn = py.path.local(fn)
             if not fn.relto(udir):
                 newname = self.targetdir.join(fn.basename)
+                if newname.check(exists=True):
+                    raise ValueError(
+                        "Cannot have two different separate_module_sources "
+                        "with the same basename, please rename one: %s" % fn.basename)
                 fn.copy(newname)
                 fn = newname
             extrafiles.append(fn)

From pypy.commits at gmail.com  Fri Jan 17 16:54:55 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 13:54:55 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: remove two dead methods
Message-ID: <5e222d2f.1c69fb81.e6e0f.c680@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98555:8b7deae55140
Date: 2020-01-17 22:53 +0100
http://bitbucket.org/pypy/pypy/changeset/8b7deae55140/

Log:	remove two dead methods

diff --git a/pypy/interpreter/astcompiler/astbuilder.py b/pypy/interpreter/astcompiler/astbuilder.py
--- a/pypy/interpreter/astcompiler/astbuilder.py
+++ b/pypy/interpreter/astcompiler/astbuilder.py
@@ -472,11 +472,6 @@
             name, call.args, call.keywords,
             body, decorators, classdef_node.get_lineno(), classdef_node.get_column())
 
-    def handle_class_bases(self, bases_node):
-        if bases_node.num_children() == 1:
-            return [self.handle_expr(bases_node.get_child(0))]
-        return self.get_expression_list(bases_node)
-
     def handle_funcdef_impl(self, funcdef_node, is_async, decorators=None):
         name_node = funcdef_node.get_child(1)
         name = self.new_identifier(name_node.get_value())
diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -208,16 +208,6 @@
         """Override in subclasses to compile a scope."""
         raise NotImplementedError
 
-    def current_temporary_name(self):
-        """Return the name of the current temporary variable.
-
-        This must be in sync with the one during symbol table building.
-        """
-        name = "_[%d]" % (self.temporary_name_counter,)
-        self.temporary_name_counter += 1
-        assert self.scope.lookup(name) != symtable.SCOPE_UNKNOWN
-        return name
-
     def sub_scope(self, kind, name, node, lineno):
         """Convenience function for compiling a sub scope."""
         if self.scope.lookup(name) == symtable.SCOPE_GLOBAL_EXPLICIT:

From pypy.commits at gmail.com  Fri Jan 17 16:54:57 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 17 Jan 2020 13:54:57 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: remove these,
 I don't think they are relevant any more
Message-ID: <5e222d31.1c69fb81.e161c.6328@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98556:2bc8bf236aa7
Date: 2020-01-17 22:54 +0100
http://bitbucket.org/pypy/pypy/changeset/2bc8bf236aa7/

Log:	remove these, I don't think they are relevant any more

diff --git a/pypy/TODO b/pypy/TODO
deleted file mode 100644
--- a/pypy/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-antocuni's older TODO:
-
-* run coverage against the parser/astbuilder/astcompiler: it's probably full of
-dead code because the grammar changed
-
-* review use of std_decode_utf8, we probably do not want to be using it

From pypy.commits at gmail.com  Sat Jan 18 05:50:01 2020
From: pypy.commits at gmail.com (arigo)
Date: Sat, 18 Jan 2020 02:50:01 -0800 (PST)
Subject: [pypy-commit] cffi default: Merged in
 lukeroge/cffi/Luke-Rogers/add-license-to-trove-classifiers-1578493878065
 (pull request #99)
Message-ID: <5e22e2d9.1c69fb81.887cd.3143@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r3329:30e8b8974143
Date: 2020-01-18 10:49 +0000
http://bitbucket.org/cffi/cffi/changeset/30e8b8974143/

Log:	Merged in lukeroge/cffi/Luke-Rogers/add-license-to-trove-
	classifiers-1578493878065 (pull request #99)

	Add license to trove classifiers.

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -246,5 +246,6 @@
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: Implementation :: CPython',
             'Programming Language :: Python :: Implementation :: PyPy',
+            'License :: OSI Approved :: MIT License',
         ],
     )

From pypy.commits at gmail.com  Sat Jan 18 05:50:05 2020
From: pypy.commits at gmail.com (lukeroge)
Date: Sat, 18 Jan 2020 02:50:05 -0800 (PST)
Subject: [pypy-commit] cffi
 Luke-Rogers/add-license-to-trove-classifiers-1578493878065: Add license to
 trove classifiers.
Message-ID: <5e22e2dd.1c69fb81.3eac2.d9c0@mx.google.com>

Author: Luke Rogers 
Branch: Luke-Rogers/add-license-to-trove-classifiers-1578493878065
Changeset: r3328:343d86320d17
Date: 2020-01-08 14:31 +0000
http://bitbucket.org/cffi/cffi/changeset/343d86320d17/

Log:	Add license to trove classifiers.

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -246,5 +246,6 @@
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: Implementation :: CPython',
             'Programming Language :: Python :: Implementation :: PyPy',
+            'License :: OSI Approved :: MIT License',
         ],
     )

From pypy.commits at gmail.com  Sun Jan 19 04:23:44 2020
From: pypy.commits at gmail.com (arigo)
Date: Sun, 19 Jan 2020 01:23:44 -0800 (PST)
Subject: [pypy-commit] cffi default: Issue #440
Message-ID: <5e242020.1c69fb81.f3667.1d5b@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r3330:13004e3998dc
Date: 2020-01-19 10:23 +0100
http://bitbucket.org/cffi/cffi/changeset/13004e3998dc/

Log:	Issue #440

	Limit the amount of memory that is requested from alloca() for
	temporary conversion of arguments. Non-small requests are instead
	handled with PyObject_Malloc() and PyObject_Free().

diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -2991,6 +2991,10 @@
     CTypeDescrObject *fresult;
     char *resultdata;
     char *errormsg;
+    struct freeme_s {
+        struct freeme_s *next;
+        union_alignment alignment;
+    } *freeme = NULL;
 
     if (!(cd->c_type->ct_flags & CT_FUNCTIONPTR)) {
         PyErr_Format(PyExc_TypeError, "cdata '%s' is not callable",
@@ -3111,7 +3115,21 @@
             else if (datasize < 0)
                 goto error;
             else {
-                tmpbuf = alloca(datasize);
+                if (datasize <= 512) {
+                    tmpbuf = alloca(datasize);
+                }
+                else {
+                    struct freeme_s *fp = (struct freeme_s *)PyObject_Malloc(
+                        offsetof(struct freeme_s, alignment) +
+                        (size_t)datasize);
+                    if (fp == NULL) {
+                        PyErr_NoMemory();
+                        goto error;
+                    }
+                    fp->next = freeme;
+                    freeme = fp;
+                    tmpbuf = (char *)&fp->alignment;
+                }
                 memset(tmpbuf, 0, datasize);
                 *(char **)data = tmpbuf;
                 if (convert_array_from_object(tmpbuf, argtype, obj) < 0)
@@ -3156,6 +3174,11 @@
     /* fall-through */
 
  error:
+    while (freeme != NULL) {
+        void *p = (void *)freeme;
+        freeme = freeme->next;
+        PyObject_Free(p);
+    }
     if (buffer)
         PyObject_Free(buffer);
     if (fvarargs != NULL) {
diff --git a/cffi/_cffi_include.h b/cffi/_cffi_include.h
--- a/cffi/_cffi_include.h
+++ b/cffi/_cffi_include.h
@@ -269,6 +269,54 @@
         return _cffi_from_c_wchar3216_t((int)x);
 }
 
+union _cffi_union_alignment_u {
+    unsigned char m_char;
+    unsigned short m_short;
+    unsigned int m_int;
+    unsigned long m_long;
+    unsigned long long m_longlong;
+    float m_float;
+    double m_double;
+    long double m_longdouble;
+};
+
+struct _cffi_freeme_s {
+    struct _cffi_freeme_s *next;
+    union _cffi_union_alignment_u alignment;
+};
+
+_CFFI_UNUSED_FN static int
+_cffi_convert_array_argument(struct _cffi_ctypedescr *ctptr, PyObject *arg,
+                             char **output_data, Py_ssize_t datasize,
+                             struct _cffi_freeme_s **freeme)
+{
+    char *p;
+    if (datasize < 0)
+        return -1;
+
+    p = *output_data;
+    if (p == NULL) {
+        struct _cffi_freeme_s *fp = (struct _cffi_freeme_s *)PyObject_Malloc(
+            offsetof(struct _cffi_freeme_s, alignment) + (size_t)datasize);
+        if (fp == NULL)
+            return -1;
+        fp->next = *freeme;
+        *freeme = fp;
+        p = *output_data = (char *)&fp->alignment;
+    }
+    memset((void *)p, 0, (size_t)datasize);
+    return _cffi_convert_array_from_object(p, ctptr, arg);
+}
+
+_CFFI_UNUSED_FN static void
+_cffi_free_array_arguments(struct _cffi_freeme_s *freeme)
+{
+    do {
+        void *p = (void *)freeme;
+        freeme = freeme->next;
+        PyObject_Free(p);
+    } while (freeme != NULL);
+}
 
 /**********  end CPython-specific section  **********/
 #else
diff --git a/cffi/recompiler.py b/cffi/recompiler.py
--- a/cffi/recompiler.py
+++ b/cffi/recompiler.py
@@ -560,23 +560,24 @@
             tovar, tp.get_c_name(''), errvalue))
         self._prnt('    %s;' % errcode)
 
-    def _extra_local_variables(self, tp, localvars):
+    def _extra_local_variables(self, tp, localvars, freelines):
         if isinstance(tp, model.PointerType):
             localvars.add('Py_ssize_t datasize')
+            localvars.add('struct _cffi_freeme_s *large_args_free = NULL')
+            freelines.add('if (large_args_free != NULL)'
+                          ' _cffi_free_array_arguments(large_args_free);')
 
     def _convert_funcarg_to_c_ptr_or_array(self, tp, fromvar, tovar, errcode):
         self._prnt('  datasize = _cffi_prepare_pointer_call_argument(')
         self._prnt('      _cffi_type(%d), %s, (char **)&%s);' % (
             self._gettypenum(tp), fromvar, tovar))
         self._prnt('  if (datasize != 0) {')
-        self._prnt('    if (datasize < 0)')
-        self._prnt('      %s;' % errcode)
-        self._prnt('    %s = (%s)alloca((size_t)datasize);' % (
+        self._prnt('    %s = ((size_t)datasize) <= 640 ? '
+                   '(%s)alloca((size_t)datasize) : NULL;' % (
             tovar, tp.get_c_name('')))
-        self._prnt('    memset((void *)%s, 0, (size_t)datasize);' % (tovar,))
-        self._prnt('    if (_cffi_convert_array_from_object('
-                   '(char *)%s, _cffi_type(%d), %s) < 0)' % (
-            tovar, self._gettypenum(tp), fromvar))
+        self._prnt('    if (_cffi_convert_array_argument(_cffi_type(%d), %s, '
+                   '(char **)&%s,' % (self._gettypenum(tp), fromvar, tovar))
+        self._prnt('            datasize, &large_args_free) < 0)')
         self._prnt('      %s;' % errcode)
         self._prnt('  }')
 
@@ -699,9 +700,10 @@
             prnt('  %s;' % arg)
         #
         localvars = set()
+        freelines = set()
         for type in tp.args:
-            self._extra_local_variables(type, localvars)
-        for decl in localvars:
+            self._extra_local_variables(type, localvars, freelines)
+        for decl in sorted(localvars):
             prnt('  %s;' % (decl,))
         #
         if not isinstance(tp.result, model.VoidType):
@@ -709,6 +711,7 @@
             context = 'result of %s' % name
             result_decl = '  %s;' % tp.result.get_c_name(' result', context)
             prnt(result_decl)
+            prnt('  PyObject *pyresult;')
         else:
             result_decl = None
             result_code = ''
@@ -742,9 +745,14 @@
         if numargs == 0:
             prnt('  (void)noarg; /* unused */')
         if result_code:
-            prnt('  return %s;' %
+            prnt('  pyresult = %s;' %
                  self._convert_expr_from_c(tp.result, 'result', 'result type'))
+            for freeline in freelines:
+                prnt('  ' + freeline)
+            prnt('  return pyresult;')
         else:
+            for freeline in freelines:
+                prnt('  ' + freeline)
             prnt('  Py_INCREF(Py_None);')
             prnt('  return Py_None;')
         prnt('}')
diff --git a/cffi/vengine_cpy.py b/cffi/vengine_cpy.py
--- a/cffi/vengine_cpy.py
+++ b/cffi/vengine_cpy.py
@@ -275,22 +275,23 @@
             tovar, tp.get_c_name(''), errvalue))
         self._prnt('    %s;' % errcode)
 
-    def _extra_local_variables(self, tp, localvars):
+    def _extra_local_variables(self, tp, localvars, freelines):
         if isinstance(tp, model.PointerType):
             localvars.add('Py_ssize_t datasize')
+            localvars.add('struct _cffi_freeme_s *large_args_free = NULL')
+            freelines.add('if (large_args_free != NULL)'
+                          ' _cffi_free_array_arguments(large_args_free);')
 
     def _convert_funcarg_to_c_ptr_or_array(self, tp, fromvar, tovar, errcode):
         self._prnt('  datasize = _cffi_prepare_pointer_call_argument(')
         self._prnt('      _cffi_type(%d), %s, (char **)&%s);' % (
             self._gettypenum(tp), fromvar, tovar))
         self._prnt('  if (datasize != 0) {')
-        self._prnt('    if (datasize < 0)')
-        self._prnt('      %s;' % errcode)
-        self._prnt('    %s = alloca((size_t)datasize);' % (tovar,))
-        self._prnt('    memset((void *)%s, 0, (size_t)datasize);' % (tovar,))
-        self._prnt('    if (_cffi_convert_array_from_object('
-                   '(char *)%s, _cffi_type(%d), %s) < 0)' % (
-            tovar, self._gettypenum(tp), fromvar))
+        self._prnt('    %s = ((size_t)datasize) <= 640 ? '
+                   'alloca((size_t)datasize) : NULL;' % (tovar,))
+        self._prnt('    if (_cffi_convert_array_argument(_cffi_type(%d), %s, '
+                   '(char **)&%s,' % (self._gettypenum(tp), fromvar, tovar))
+        self._prnt('            datasize, &large_args_free) < 0)')
         self._prnt('      %s;' % errcode)
         self._prnt('  }')
 
@@ -369,15 +370,17 @@
             prnt('  %s;' % type.get_c_name(' x%d' % i, context))
         #
         localvars = set()
+        freelines = set()
         for type in tp.args:
-            self._extra_local_variables(type, localvars)
-        for decl in localvars:
+            self._extra_local_variables(type, localvars, freelines)
+        for decl in sorted(localvars):
             prnt('  %s;' % (decl,))
         #
         if not isinstance(tp.result, model.VoidType):
             result_code = 'result = '
             context = 'result of %s' % name
             prnt('  %s;' % tp.result.get_c_name(' result', context))
+            prnt('  PyObject *pyresult;')
         else:
             result_code = ''
         #
@@ -409,9 +412,14 @@
         if numargs == 0:
             prnt('  (void)noarg; /* unused */')
         if result_code:
-            prnt('  return %s;' %
+            prnt('  pyresult = %s;' %
                  self._convert_expr_from_c(tp.result, 'result', 'result type'))
+            for freeline in freelines:
+                prnt('  ' + freeline)
+            prnt('  return pyresult;')
         else:
+            for freeline in freelines:
+                prnt('  ' + freeline)
             prnt('  Py_INCREF(Py_None);')
             prnt('  return Py_None;')
         prnt('}')
@@ -981,6 +989,59 @@
     return PyBool_FromLong(was_alive);
 }
 
+union _cffi_union_alignment_u {
+    unsigned char m_char;
+    unsigned short m_short;
+    unsigned int m_int;
+    unsigned long m_long;
+    unsigned long long m_longlong;
+    float m_float;
+    double m_double;
+    long double m_longdouble;
+};
+
+struct _cffi_freeme_s {
+    struct _cffi_freeme_s *next;
+    union _cffi_union_alignment_u alignment;
+};
+
+#ifdef __GNUC__
+  __attribute__((unused))
+#endif
+static int _cffi_convert_array_argument(CTypeDescrObject *ctptr, PyObject *arg,
+                                        char **output_data, Py_ssize_t datasize,
+                                        struct _cffi_freeme_s **freeme)
+{
+    char *p;
+    if (datasize < 0)
+        return -1;
+
+    p = *output_data;
+    if (p == NULL) {
+        struct _cffi_freeme_s *fp = (struct _cffi_freeme_s *)PyObject_Malloc(
+            offsetof(struct _cffi_freeme_s, alignment) + (size_t)datasize);
+        if (fp == NULL)
+            return -1;
+        fp->next = *freeme;
+        *freeme = fp;
+        p = *output_data = (char *)&fp->alignment;
+    }
+    memset((void *)p, 0, (size_t)datasize);
+    return _cffi_convert_array_from_object(p, ctptr, arg);
+}
+
+#ifdef __GNUC__
+  __attribute__((unused))
+#endif
+static void _cffi_free_array_arguments(struct _cffi_freeme_s *freeme)
+{
+    do {
+        void *p = (void *)freeme;
+        freeme = freeme->next;
+        PyObject_Free(p);
+    } while (freeme != NULL);
+}
+
 static int _cffi_init(void)
 {
     PyObject *module, *c_api_object = NULL;
diff --git a/testing/cffi0/test_function.py b/testing/cffi0/test_function.py
--- a/testing/cffi0/test_function.py
+++ b/testing/cffi0/test_function.py
@@ -520,3 +520,16 @@
         assert str(e.value).startswith("library '")
         assert str(e.value).endswith("' has already been closed")
         ffi.dlclose(lib)    # does not raise
+
+    def test_passing_large_list(self):
+        if self.Backend is CTypesBackend:
+            py.test.skip("the ctypes backend doesn't support this")
+        ffi = FFI(backend=self.Backend())
+        ffi.cdef("""
+            void getenv(char *);
+        """)
+        needs_dlopen_none()
+        m = ffi.dlopen(None)
+        arg = [b"F", b"O", b"O"] + [b"\x00"] * 20000000
+        x = m.getenv(arg)
+        assert x is None
diff --git a/testing/cffi0/test_verify.py b/testing/cffi0/test_verify.py
--- a/testing/cffi0/test_verify.py
+++ b/testing/cffi0/test_verify.py
@@ -2550,3 +2550,13 @@
         """.replace('?', str(a)))
         # the verify() crashes if the values in the enum are different from
         # the values we computed ourselves from the cdef()
+
+def test_passing_large_list():
+    ffi = FFI()
+    ffi.cdef("""void passing_large_list(long[]);""")
+    lib = ffi.verify("""
+        static void passing_large_list(long a[]) { }
+    """)
+    arg = list(range(20000000))
+    lib.passing_large_list(arg)
+    # assert did not segfault
diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
--- a/testing/cffi1/test_recompiler.py
+++ b/testing/cffi1/test_recompiler.py
@@ -2445,3 +2445,13 @@
         };
     """)
     py.test.raises(RuntimeError, ffi.new, "struct BinaryTree *")
+
+def test_passing_large_list():
+    ffi = FFI()
+    ffi.cdef("""void passing_large_list(long[]);""")
+    lib = verify(ffi, "test_passing_large_list", """
+        static void passing_large_list(long a[]) { }
+    """)
+    arg = list(range(20000000))
+    lib.passing_large_list(arg)
+    # assert did not segfault

From pypy.commits at gmail.com  Sun Jan 19 04:55:02 2020
From: pypy.commits at gmail.com (arigo)
Date: Sun, 19 Jan 2020 01:55:02 -0800 (PST)
Subject: [pypy-commit] cffi default: Document #440 in details
Message-ID: <5e242776.1c69fb81.3975f.ec7c@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r3331:d00996ba7f3b
Date: 2020-01-19 10:54 +0100
http://bitbucket.org/cffi/cffi/changeset/d00996ba7f3b/

Log:	Document #440 in details

diff --git a/doc/source/whatsnew.rst b/doc/source/whatsnew.rst
--- a/doc/source/whatsnew.rst
+++ b/doc/source/whatsnew.rst
@@ -9,6 +9,24 @@
 * ``ffi.dlopen()`` can now be called with a handle (as a ``void *``) to an
   already-opened C library.
 
+* CPython only: fixed a stack overflow issue for calls like
+  ``lib.myfunc([large list])``.  If the function is declared as taking a
+  ``float *`` argument, for example, then the array is temporarily converted
+  into a C array of floats---however, the code used to use ``alloca()`` for
+  this temporary storage, no matter how large.  This is now fixed.
+
+  The fix concerns all modes: in-line/out-of-line API/ABI.  Also note that your
+  API-mode C extension modules need to be regenerated with cffi 1.14 in order
+  to get the fix; i.e. for API mode, the fix is in the generated C sources.
+  (The C sources generated from cffi 1.14 should also work when running in
+  a different environment in which we have an older version of cffi.  Also,
+  this change makes no difference on PyPy.)
+
+  As a workaround that works on all versions of cffi, you can write
+  ``lib.myfunc(ffi.new("float[]", [large list]))``, which is
+  equivalent but explicity builds the intermediate array as a regular
+  Python object on the heap.
+
 
 v1.13.2
 =======

From pypy.commits at gmail.com  Sun Jan 19 21:44:54 2020
From: pypy.commits at gmail.com (mattip)
Date: Sun, 19 Jan 2020 18:44:54 -0800 (PST)
Subject: [pypy-commit] pypy default: test,
 fix corner case in the fix to #3149 that broke lib-python test
Message-ID: <5e251426.1c69fb81.1afb7.ce01@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r98560:dc4c8f284eee
Date: 2020-01-20 13:44 +1100
http://bitbucket.org/pypy/pypy/changeset/dc4c8f284eee/

Log:	test, fix corner case in the fix to #3149 that broke lib-python test

diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -232,7 +232,10 @@
     # many-years issue report: https://bugs.python.org/issue12029), and
     # there are probably tests, so we won't call abstract_issubclass_w()
     # either in PyPy3.
-    return abstract_issubclass_w(space, w_cls1, w_cls2, True)
+    try:
+        return abstract_issubclass_w(space, w_cls1, w_cls2, True)
+    except OperationError as e:
+        return False
 
 # ____________________________________________________________
 # App-level interface
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -259,3 +259,35 @@
             raise Special, ValueError()
         except ValueError:
             pass
+
+    def test_exception_bad_subclasscheck(self):
+        import sys
+        class Meta(type):
+            def __subclasscheck__(cls, subclass):
+                raise ValueError()
+
+        class MyException(Exception):
+            __metaclass__ = Meta
+            pass
+
+        try:
+            raise KeyError()
+        except MyException, e:
+            assert False, "exception should not be a MyException"
+        except KeyError:
+            pass
+        except:
+            assert False, "Should have raised KeyError"
+        else:
+            assert False, "Should have raised KeyError"
+
+        def g():
+            try:
+                return g()
+            except RuntimeError:
+                return sys.exc_info()
+        e, v, tb = g()
+        assert e is RuntimeError, str(e)
+        assert "maximum recursion depth exceeded" in str(v)
+
+ 

From pypy.commits at gmail.com  Mon Jan 20 06:44:05 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Mon, 20 Jan 2020 03:44:05 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: port over enough of the pytime changes to
 make _testcapi compile
Message-ID: <5e259285.1c69fb81.2fffe.bb77@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98561:121428ee2494
Date: 2020-01-18 22:17 +0100
http://bitbucket.org/pypy/pypy/changeset/121428ee2494/

Log:	port over enough of the pytime changes to make _testcapi compile

diff --git a/pypy/module/cpyext/include/pytime.h b/pypy/module/cpyext/include/pytime.h
--- a/pypy/module/cpyext/include/pytime.h
+++ b/pypy/module/cpyext/include/pytime.h
@@ -85,7 +85,11 @@
             ((_PyTime_t)(seconds) * (1000 * 1000 * 1000))
 
 /* Create a timestamp from a number of nanoseconds. */
-PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(long long ns);
+PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(_PyTime_t ns);
+
+/* Create a timestamp from nanoseconds (Python int). */
+PyAPI_FUNC(int) _PyTime_FromNanosecondsObject(_PyTime_t *t,
+    PyObject *obj);
 
 /* Convert a number of seconds (Python float or int) to a timetamp.
    Raise an exception and return -1 on error, return 0 on success. */
diff --git a/pypy/module/cpyext/src/pytime.c b/pypy/module/cpyext/src/pytime.c
--- a/pypy/module/cpyext/src/pytime.c
+++ b/pypy/module/cpyext/src/pytime.c
@@ -239,12 +239,37 @@
 }
 
 _PyTime_t
-_PyTime_FromNanoseconds(long long ns)
+_PyTime_FromNanoseconds(_PyTime_t ns)
 {
+    /* _PyTime_t already uses nanosecond resolution, no conversion needed */
+    return ns;
+}
+
+int
+_PyTime_FromNanosecondsObject(_PyTime_t *tp, PyObject *obj)
+{
+    long long nsec;
     _PyTime_t t;
-    Py_BUILD_ASSERT(sizeof(long long) <= sizeof(_PyTime_t));
-    t = Py_SAFE_DOWNCAST(ns, long long, _PyTime_t);
-    return t;
+
+    if (!PyLong_Check(obj)) {
+        PyErr_Format(PyExc_TypeError, "expect int, got %s",
+                     Py_TYPE(obj)->tp_name);
+        return -1;
+    }
+
+    Py_BUILD_ASSERT(sizeof(long long) == sizeof(_PyTime_t));
+    nsec = PyLong_AsLongLong(obj);
+    if (nsec == -1 && PyErr_Occurred()) {
+        if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+            _PyTime_overflow();
+        }
+        return -1;
+    }
+
+    /* _PyTime_t already uses nanosecond resolution, no conversion needed */
+    t = (_PyTime_t)nsec;
+    *tp = t;
+    return 0;
 }
 
 #ifdef HAVE_CLOCK_GETTIME

From pypy.commits at gmail.com  Mon Jan 20 06:44:07 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Mon, 20 Jan 2020 03:44:07 -0800 (PST)
Subject: [pypy-commit] pypy default: don't catch KeyboardInterrupt, etc
Message-ID: <5e259287.1c69fb81.24fbe.5b1e@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98562:7832ebb3de87
Date: 2020-01-20 12:43 +0100
http://bitbucket.org/pypy/pypy/changeset/7832ebb3de87/

Log:	don't catch KeyboardInterrupt, etc

diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -235,6 +235,8 @@
     try:
         return abstract_issubclass_w(space, w_cls1, w_cls2, True)
     except OperationError as e:
+        if e.async(space):
+            raise
         return False
 
 # ____________________________________________________________

From pypy.commits at gmail.com  Mon Jan 20 10:05:18 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Mon, 20 Jan 2020 07:05:18 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: object.__reduce__ doens't take an
 argument any more, but __reduce_ex__ requires one
Message-ID: <5e25c1ae.1c69fb81.5efd3.0b51@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98563:46975a7b0a7b
Date: 2020-01-20 15:19 +0100
http://bitbucket.org/pypy/pypy/changeset/46975a7b0a7b/

Log:	object.__reduce__ doens't take an argument any more, but
	__reduce_ex__ requires one

diff --git a/pypy/objspace/std/objectobject.py b/pypy/objspace/std/objectobject.py
--- a/pypy/objspace/std/objectobject.py
+++ b/pypy/objspace/std/objectobject.py
@@ -210,8 +210,22 @@
         w_kwargs = space.w_None
     return hasargs, w_args, w_kwargs
 
+def descr__reduce__(space, w_obj):
+    w_proto = space.newint(0)
+    return reduce_1(space, w_obj, w_proto)
+
 @unwrap_spec(proto=int)
-def descr__reduce__(space, w_obj, proto=0):
+def descr__reduce_ex__(space, w_obj, proto):
+    w_st_reduce = space.newtext('__reduce__')
+    w_reduce = space.findattr(w_obj, w_st_reduce)
+    if w_reduce is not None:
+        # Check if __reduce__ has been overridden:
+        # "type(obj).__reduce__ is not object.__reduce__"
+        w_cls_reduce = space.getattr(space.type(w_obj), w_st_reduce)
+        w_obj_reduce = space.getattr(space.w_object, w_st_reduce)
+        override = not space.is_w(w_cls_reduce, w_obj_reduce)
+        if override:
+            return space.call_function(w_reduce)
     w_proto = space.newint(proto)
     if proto >= 2:
         hasargs, w_args, w_kwargs = _getnewargs(space, w_obj)
@@ -227,20 +241,6 @@
         return reduce_2(space, w_obj, w_proto, w_args, w_kwargs)
     return reduce_1(space, w_obj, w_proto)
 
- at unwrap_spec(proto=int)
-def descr__reduce_ex__(space, w_obj, proto=0):
-    w_st_reduce = space.newtext('__reduce__')
-    w_reduce = space.findattr(w_obj, w_st_reduce)
-    if w_reduce is not None:
-        # Check if __reduce__ has been overridden:
-        # "type(obj).__reduce__ is not object.__reduce__"
-        w_cls_reduce = space.getattr(space.type(w_obj), w_st_reduce)
-        w_obj_reduce = space.getattr(space.w_object, w_st_reduce)
-        override = not space.is_w(w_cls_reduce, w_obj_reduce)
-        if override:
-            return space.call_function(w_reduce)
-    return descr__reduce__(space, w_obj, proto)
-
 def descr___format__(space, w_obj, w_format_spec):
     if space.isinstance_w(w_format_spec, space.w_unicode):
         w_as_str = space.call_function(space.w_unicode, w_obj)
diff --git a/pypy/objspace/std/test/test_obj.py b/pypy/objspace/std/test/test_obj.py
--- a/pypy/objspace/std/test/test_obj.py
+++ b/pypy/objspace/std/test/test_obj.py
@@ -71,7 +71,7 @@
                 return (self._name,), dict(value=int(self))
         import copyreg
         for protocol in [2, 3, 4]:
-            assert NamedInt("Name", value=42).__reduce__(protocol) == (
+            assert NamedInt("Name", value=42).__reduce_ex__(protocol) == (
                 copyreg.__newobj_ex__,
                 (NamedInt, ('Name',), dict(value=42)),
                 dict(_name='Name'), None, None)
@@ -136,6 +136,14 @@
             pass
         assert X().__reduce_ex__(2)[2] is None
 
+    def test_reduce_arguments(self):
+        # since python3.7 object.__reduce__ doesn't take an argument anymore
+        # (used to be proto), and __reduce_ex__ requires one
+        with raises(TypeError):
+            object().__reduce__(0)
+        with raises(TypeError):
+            object().__reduce_ex__()
+
     def test_default_format(self):
         class x(object):
             def __str__(self):

From pypy.commits at gmail.com  Mon Jan 20 12:43:49 2020
From: pypy.commits at gmail.com (arigo)
Date: Mon, 20 Jan 2020 09:43:49 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: Big room is fine
Message-ID: <5e25e6d5.1c69fb81.5739d.0ba7@mx.google.com>

Author: Armin Rigo 
Branch: extradoc
Changeset: r5981:dbc919a474ed
Date: 2020-01-20 18:43 +0100
http://bitbucket.org/pypy/extradoc/changeset/dbc919a474ed/

Log:	Big room is fine

diff --git a/sprintinfo/leysin-winter-2020/people.txt b/sprintinfo/leysin-winter-2020/people.txt
--- a/sprintinfo/leysin-winter-2020/people.txt
+++ b/sprintinfo/leysin-winter-2020/people.txt
@@ -11,7 +11,7 @@
 ==================== ============== =======================
 Armin Rigo                          private
 Antonio Cuni         flexible       Les Airelles, preferably single room
-Omer Katz
+Omer Katz                           Les Airelles, big room
 Manuel Jacob         Mar 1–8+       Les Airelles
 Simon Cross          Feb 27-Mar 6   Les Airelles, bringing partner
 ==================== ============== =======================

From pypy.commits at gmail.com  Mon Jan 20 23:19:34 2020
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 20 Jan 2020 20:19:34 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: Add @pytest.mark.pypy_only to simplify
 skipping PyPy-specific app-level tests on CPython
Message-ID: <5e267bd6.1c69fb81.6630d.8215@mx.google.com>

Author: Ronan Lamy 
Branch: py3.6
Changeset: r98565:b195c68558a4
Date: 2020-01-21 03:41 +0000
http://bitbucket.org/pypy/pypy/changeset/b195c68558a4/

Log:	Add @pytest.mark.pypy_only to simplify skipping PyPy-specific app-
	level tests on CPython

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -68,6 +68,9 @@
     if not mode_A and not mode_D:  # 'own' tests
         from rpython.conftest import LeakFinder
         config.pluginmanager.register(LeakFinder())
+    if mode_A:
+        from pypy.tool.pytest.apptest import PythonInterpreter
+        config.applevel = PythonInterpreter(config.option.python)
 
 def pytest_addoption(parser):
     group = parser.getgroup("pypy options")
@@ -201,13 +204,16 @@
 @pytest.hookimpl(tryfirst=True)
 def pytest_runtest_setup(item):
     if isinstance(item, py.test.collect.Function):
+        config = item.config
+        if item.get_marker(name='pypy_only') and not config.applevel.is_pypy:
+            pytest.skip('PyPy-specific test')
         appclass = item.getparent(py.test.Class)
         if appclass is not None:
             from pypy.tool.pytest.objspace import gettestobjspace
             # Make cls.space and cls.runappdirect available in tests.
             spaceconfig = getattr(appclass.obj, 'spaceconfig', {})
             appclass.obj.space = gettestobjspace(**spaceconfig)
-            appclass.obj.runappdirect = option.runappdirect
+            appclass.obj.runappdirect = config.option.runappdirect
 
 def pytest_ignore_collect(path, config):
     if (config.getoption('direct_apptest') and not path.isdir()
diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -806,7 +806,7 @@
         exc = raises(TypeError, '(lambda *, kw: 0)(1, kw=3)')
         assert str(exc.value) == "() takes 0 positional arguments but 1 positional argument (and 1 keyword-only argument) were given"
 
-    @py.test.mark.skipif("config.option.runappdirect")
+    @pytest.mark.pypy_only
     def test_error_message_method(self):
         class A(object):
             def f0():
@@ -823,14 +823,14 @@
         # does not contain the warning about missing self
         assert exc.value.args[0] == "f0() takes 0 positional arguments but 1 was given"
 
-    @py.test.mark.skipif("config.option.runappdirect")
+    @pytest.mark.pypy_only
     def test_error_message_module_function(self):
         import operator # use countOf because it's defined at applevel
         exc = raises(TypeError, lambda : operator.countOf(1, 2, 3))
         # does not contain the warning about missing self
         assert exc.value.args[0] == "countOf() takes 2 positional arguments but 3 were given"
 
-    @py.test.mark.skipif("config.option.runappdirect")
+    @pytest.mark.pypy_only
     def test_error_message_bound_method(self):
         class A(object):
             def f0():
diff --git a/pypy/tool/pytest/apptest.py b/pypy/tool/pytest/apptest.py
--- a/pypy/tool/pytest/apptest.py
+++ b/pypy/tool/pytest/apptest.py
@@ -35,6 +35,24 @@
     def __init__(self, excinfo):
         self.excinfo = excinfo
 
+class PythonInterpreter(object):
+    def __init__(self, path):
+        self.path = path
+        self._is_pypy = None
+
+    @property
+    def is_pypy(self):
+        if self._is_pypy is not None:
+            return self._is_pypy
+        CODE = "import sys; print('__pypy__' in sys.builtin_module_names)"
+        res, stdout, stderr = run_subprocess( self.path, ["-c", CODE])
+        if res != 0:
+            raise ValueError("Invalid Python interpreter")
+        print stdout
+        is_pypy = stdout.strip() == 'True'
+        self._is_pypy = is_pypy
+        return is_pypy
+
 
 def py3k_repr(value):
     "return the repr() that py3k would give for an object."""
@@ -120,7 +138,7 @@
                 pytest.fail("DID NOT RAISE")
             self.value = tp[1]
             return issubclass(tp[0], self.expected_exception)
-    
+
     __builtins__.raises = raises
     class Test:
         pass

From pypy.commits at gmail.com  Mon Jan 20 23:19:36 2020
From: pypy.commits at gmail.com (rlamy)
Date: Mon, 20 Jan 2020 20:19:36 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: hg merge default
Message-ID: <5e267bd8.1c69fb81.6926e.8f13@mx.google.com>

Author: Ronan Lamy 
Branch: py3.6
Changeset: r98566:3811ac3540f6
Date: 2020-01-21 04:18 +0000
http://bitbucket.org/pypy/pypy/changeset/3811ac3540f6/

Log:	hg merge default

diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -215,7 +215,7 @@
 
     def test_dont_call_instancecheck_fast_path(self):
         called = []
-        
+
         class M(type):
             def __instancecheck__(self, obj):
                 called.append("called")
@@ -271,3 +271,25 @@
             skip("non-normalized exception") #raise Special, ValueError()
         except Special:
             pass
+
+    def test_exception_bad_subclasscheck(self):
+        """
+        import sys
+        class Meta(type):
+            def __subclasscheck__(cls, subclass):
+                raise ValueError()
+
+        class MyException(Exception, metaclass=Meta):
+            pass
+
+        try:
+            raise KeyError()
+        except MyException as e:
+            assert False, "exception should not be a MyException"
+        except KeyError:
+            pass
+        except:
+            assert False, "Should have raised KeyError"
+        else:
+            assert False, "Should have raised KeyError"
+        """

From pypy.commits at gmail.com  Tue Jan 21 03:37:23 2020
From: pypy.commits at gmail.com (mjacob)
Date: Tue, 21 Jan 2020 00:37:23 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: Update dates.
Message-ID: <5e26b843.1c69fb81.c9cb5.f476@mx.google.com>

Author: Manuel Jacob 
Branch: extradoc
Changeset: r5983:64eca22e807a
Date: 2020-01-21 09:37 +0100
http://bitbucket.org/pypy/extradoc/changeset/64eca22e807a/

Log:	Update dates.

diff --git a/sprintinfo/leysin-winter-2020/people.txt b/sprintinfo/leysin-winter-2020/people.txt
--- a/sprintinfo/leysin-winter-2020/people.txt
+++ b/sprintinfo/leysin-winter-2020/people.txt
@@ -12,6 +12,6 @@
 Armin Rigo                          private
 Antonio Cuni         flexible       Les Airelles, preferably single room
 Omer Katz                           Les Airelles, big room
-Manuel Jacob         Mar 1–8+       Les Airelles
+Manuel Jacob         Feb 29–Mar 8   Les Airelles
 Simon Cross          Feb 27-Mar 6   Les Airelles, bringing partner
 ==================== ============== =======================

From pypy.commits at gmail.com  Wed Jan 22 01:00:44 2020
From: pypy.commits at gmail.com (mattip)
Date: Tue, 21 Jan 2020 22:00:44 -0800 (PST)
Subject: [pypy-commit] pypy default: test interesting part of error message,
 not the op name
Message-ID: <5e27e50c.1c69fb81.7613e.7044@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r98567:efe314c692e9
Date: 2020-01-22 16:47 +1100
http://bitbucket.org/pypy/pypy/changeset/efe314c692e9/

Log:	test interesting part of error message, not the op name

diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -759,12 +759,11 @@
         # does not contain the warning about missing self
         assert exc.value.message == "f0() takes no arguments (1 given)"
 
-    @pytest.mark.pypy_only
     def test_error_message_module_function(self):
         import operator # use repeat because it's defined at applevel
         exc = raises(TypeError, lambda : operator.repeat(1, 2, 3))
         # does not contain the warning about missing self
-        assert exc.value.message == "repeat() takes exactly 2 arguments (3 given)"
+        assert "takes exactly 2 arguments (3 given)" in str(exc.value)
 
     @pytest.mark.pypy_only
     def test_error_message_bound_method(self):

From pypy.commits at gmail.com  Wed Jan 22 08:15:02 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 22 Jan 2020 05:15:02 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: implement
 https://bugs.python.org/issue30579
Message-ID: <5e284ad6.1c69fb81.67def.9715@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98568:10615e618c98
Date: 2020-01-22 13:56 +0100
http://bitbucket.org/pypy/pypy/changeset/10615e618c98/

Log:	implement https://bugs.python.org/issue30579

	Allow the instantiation and modification of tracebacks, which some
	frameworks (examples in the issue are trio and jinja2) would really
	like to do

diff --git a/pypy/interpreter/pytraceback.py b/pypy/interpreter/pytraceback.py
--- a/pypy/interpreter/pytraceback.py
+++ b/pypy/interpreter/pytraceback.py
@@ -1,5 +1,14 @@
+import sys
+
+from pypy.interpreter.gateway import unwrap_spec
 from pypy.interpreter import baseobjspace
-from pypy.interpreter.error import OperationError
+from pypy.interpreter.error import oefmt, OperationError
+
+# for some strange reason CPython allows the setting of the lineno to be
+# negative. I am not sure why that is useful, but let's use the most negative
+# value as a sentinel to denote the default behaviour "please take the lineno
+# from the frame and lasti"
+LINENO_NOT_COMPUTED = -sys.maxint-1
 
 def offset2lineno(c, stopat):
     # even position in lnotab denote byte increments, odd line increments.
@@ -30,18 +39,53 @@
      * 'tb_next'
     """
 
-    def __init__(self, space, frame, lasti, next):
+    def __init__(self, space, frame, lasti, next, lineno=LINENO_NOT_COMPUTED):
         self.space = space
         self.frame = frame
         self.lasti = lasti
         self.next = next
+        self.lineno = lineno
 
     def get_lineno(self):
-        return offset2lineno(self.frame.pycode, self.lasti)
+        if self.lineno == LINENO_NOT_COMPUTED:
+            self.lineno = offset2lineno(self.frame.pycode, self.lasti)
+        return self.lineno
 
-    def descr_tb_lineno(self, space):
+    def descr_get_tb_lineno(self, space):
         return space.newint(self.get_lineno())
 
+    def descr_set_tb_lineno(self, space, w_lineno):
+        self.lineno = space.int_w(w_lineno)
+
+    def descr_get_tb_lasti(self, space):
+        return space.newint(self.lasti)
+
+    def descr_set_tb_lasti(self, space, w_lasti):
+        self.lasti = space.int_w(w_lasti)
+
+    def descr_get_next(self, space):
+        return self.next
+
+    def descr_set_next(self, space, w_next):
+        newnext = space.interp_w(PyTraceback, w_next, can_be_None=True)
+        # check for loops
+        curr = newnext
+        while curr is not None:
+            if curr is self:
+                raise oefmt(space.w_ValueError, 'traceback loop detected')
+            curr = curr.next
+        self.next = newnext
+
+    @staticmethod
+    @unwrap_spec(lasti=int, lineno=int)
+    def descr_new(space, w_subtype, w_next, w_frame, lasti, lineno):
+        from pypy.interpreter.pyframe import PyFrame
+        w_next = space.interp_w(PyTraceback, w_next, can_be_None=True)
+        w_frame = space.interp_w(PyFrame, w_frame)
+        traceback = space.allocate_instance(PyTraceback, w_subtype)
+        PyTraceback.__init__(traceback, space, w_frame, lasti, w_next, lineno)
+        return traceback
+
     def descr__reduce__(self, space):
         from pypy.interpreter.mixedmodule import MixedModule
         w_mod = space.getbuiltinmodule('_pickle_support')
@@ -53,17 +97,19 @@
             self.frame,
             space.newint(self.lasti),
             self.next,
+            space.newint(self.lineno)
         ]
         nt = space.newtuple
         return nt([new_inst, nt(tup_base), nt(tup_state)])
 
     def descr__setstate__(self, space, w_args):
         from pypy.interpreter.pyframe import PyFrame
-        args_w = space.unpackiterable(w_args)
-        w_frame, w_lasti, w_next = args_w
+        args_w = space.unpackiterable(w_args, 4)
+        w_frame, w_lasti, w_next, w_lineno = args_w
         self.frame = space.interp_w(PyFrame, w_frame)
         self.lasti = space.int_w(w_lasti)
         self.next = space.interp_w(PyTraceback, w_next, can_be_None=True)
+        self.lineno = space.int_w(w_lineno)
 
     def descr__dir__(self, space):
         return space.newlist([space.newtext(n) for n in
diff --git a/pypy/interpreter/test/apptest_traceback.py b/pypy/interpreter/test/apptest_traceback.py
new file mode 100644
--- /dev/null
+++ b/pypy/interpreter/test/apptest_traceback.py
@@ -0,0 +1,65 @@
+import sys
+from pytest import raises
+from types import TracebackType
+
+def ve():
+    raise ValueError
+
+def get_tb():
+    try:
+        ve()
+    except ValueError as e:
+        return e.__traceback__
+
+def test_mutation():
+    tb = get_tb()
+
+    # allowed
+    tb.tb_next = None
+    assert tb.tb_next is None
+
+    tb2 = get_tb()
+    tb.tb_next = tb2
+    assert tb.tb_next is tb2
+
+    with raises(TypeError):
+        tb.tb_next = "rabc"
+
+    # loops are forbidden
+    with raises(ValueError):
+        tb2.tb_next = tb
+
+    with raises(ValueError):
+        tb.tb_next = tb
+
+    tb.tb_lasti = 1233
+    assert tb.tb_lasti == 1233
+    with raises(TypeError):
+        tb.tb_lasti = "abc"
+
+    tb.tb_lineno = 1233
+    assert tb.tb_lineno == 1233
+    with raises(TypeError):
+        tb.tb_lineno = "abc"
+
+        
+def test_construct():
+    frame = sys._getframe()
+    tb = get_tb()
+    tb2 = TracebackType(tb, frame, 1, 2)
+    assert tb2.tb_next is tb
+    assert tb2.tb_frame is frame
+    assert tb2.tb_lasti == 1
+    assert tb2.tb_lineno == 2
+
+    tb2 = TracebackType(tb, frame, 1, -1)
+    assert tb2.tb_next is tb
+    assert tb2.tb_frame is frame
+    assert tb2.tb_lasti == 1
+    assert tb2.tb_lineno == -1
+
+def test_can_subclass():
+    with raises(TypeError):
+        class TB(TracebackType):
+            pass
+
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -813,14 +813,15 @@
 
 PyTraceback.typedef = TypeDef("traceback",
     __reduce__ = interp2app(PyTraceback.descr__reduce__),
+    __new__ = interp2app(PyTraceback.descr_new),
     __setstate__ = interp2app(PyTraceback.descr__setstate__),
     __dir__ = interp2app(PyTraceback.descr__dir__),
     tb_frame = interp_attrproperty_w('frame', cls=PyTraceback),
-    tb_lasti = interp_attrproperty('lasti', cls=PyTraceback, wrapfn="newint"),
-    tb_lineno = GetSetProperty(PyTraceback.descr_tb_lineno),
-    tb_next = interp_attrproperty_w('next', cls=PyTraceback),
+    tb_lasti = GetSetProperty(PyTraceback.descr_get_tb_lasti, PyTraceback.descr_set_tb_lasti),
+    tb_lineno = GetSetProperty(PyTraceback.descr_get_tb_lineno, PyTraceback.descr_set_tb_lineno),
+    tb_next = GetSetProperty(PyTraceback.descr_get_next, PyTraceback.descr_set_next),
     )
-assert not PyTraceback.typedef.acceptable_as_base_class  # no __new__
+PyTraceback.typedef.acceptable_as_base_class = False
 
 GeneratorIterator.typedef = TypeDef("generator",
     __repr__   = interp2app(GeneratorIterator.descr__repr__),

From pypy.commits at gmail.com  Wed Jan 22 08:15:04 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 22 Jan 2020 05:15:04 -0800 (PST)
Subject: [pypy-commit] pypy default: be more precise about
 test_error_message_module_function: it's checking for the absence of
 something at the end
Message-ID: <5e284ad8.1c69fb81.5d284.527f@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98569:075c10ca9276
Date: 2020-01-22 14:12 +0100
http://bitbucket.org/pypy/pypy/changeset/075c10ca9276/

Log:	be more precise about test_error_message_module_function: it's
	checking for the absence of something at the end

diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -763,7 +763,8 @@
         import operator # use repeat because it's defined at applevel
         exc = raises(TypeError, lambda : operator.repeat(1, 2, 3))
         # does not contain the warning about missing self
-        assert "takes exactly 2 arguments (3 given)" in str(exc.value)
+        # in particular it must not end with ' Did you forget 'self' in the function definition?'
+        assert str(exc.value).endswith("takes exactly 2 arguments (3 given)")
 
     @pytest.mark.pypy_only
     def test_error_message_bound_method(self):

From pypy.commits at gmail.com  Wed Jan 22 14:32:52 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 22 Jan 2020 11:32:52 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: yield in comprehensions is now a
 DeprecationWarning
Message-ID: <5e28a364.1c69fb81.9f0b9.bc69@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98570:f1eb4a075455
Date: 2020-01-22 20:32 +0100
http://bitbucket.org/pypy/pypy/changeset/f1eb4a075455/

Log:	yield in comprehensions is now a DeprecationWarning

diff --git a/pypy/interpreter/astcompiler/symtable.py b/pypy/interpreter/astcompiler/symtable.py
--- a/pypy/interpreter/astcompiler/symtable.py
+++ b/pypy/interpreter/astcompiler/symtable.py
@@ -577,7 +577,7 @@
         if comp.is_async:
             self.scope.note_await(comp)
 
-    def _visit_comprehension(self, node, comps, *consider):
+    def _visit_comprehension(self, node, kind, comps, *consider):
         outer = comps[0]
         assert isinstance(outer, ast.comprehension)
         outer.iter.walkabout(self)
@@ -591,26 +591,25 @@
         for item in list(consider):
             item.walkabout(self)
         self.pop_scope()
-        # http://bugs.python.org/issue10544: was never fixed in CPython,
-        # but we can at least issue a SyntaxWarning in the meantime
+        # http://bugs.python.org/issue10544: a DeprecationWarning from 3.7 on,
+        # 3.8 will forbid it
         if new_scope.is_generator:
-            msg = ("'yield' inside a list or generator comprehension behaves "
-                   "unexpectedly (http://bugs.python.org/issue10544)")
-            misc.syntax_warning(self.space, msg, self.compile_info.filename,
-                                node.lineno, node.col_offset)
+            msg = "'yield' inside %s" % kind
+            space = self.space
+            space.warn(space.newtext(msg), space.w_DeprecationWarning)
         new_scope.is_generator |= isinstance(node, ast.GeneratorExp)
 
     def visit_ListComp(self, listcomp):
-        self._visit_comprehension(listcomp, listcomp.generators, listcomp.elt)
+        self._visit_comprehension(listcomp, "list comprehension", listcomp.generators, listcomp.elt)
 
     def visit_GeneratorExp(self, genexp):
-        self._visit_comprehension(genexp, genexp.generators, genexp.elt)
+        self._visit_comprehension(genexp, "generator expression", genexp.generators, genexp.elt)
 
     def visit_SetComp(self, setcomp):
-        self._visit_comprehension(setcomp, setcomp.generators, setcomp.elt)
+        self._visit_comprehension(setcomp, "set comprehension", setcomp.generators, setcomp.elt)
 
     def visit_DictComp(self, dictcomp):
-        self._visit_comprehension(dictcomp, dictcomp.generators,
+        self._visit_comprehension(dictcomp, "dict comprehension", dictcomp.generators,
                                   dictcomp.value, dictcomp.key)
 
     def visit_With(self, wih):
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1422,6 +1422,23 @@
         # compiling the produced AST previously triggered a crash
         compile(ast, '', 'exec')
 
+    def test_warn_yield(self):
+        import warnings
+        warnings.simplefilter("error", DeprecationWarning)
+        d = {}
+        with raises(DeprecationWarning) as info:
+            exec("x = [(yield 42) for i in j]", d)
+        assert str(info.value) == "'yield' inside list comprehension"
+        with raises(DeprecationWarning) as info:
+            exec("x = ((yield 42) for i in j)", d)
+        assert str(info.value) == "'yield' inside generator expression"
+        with raises(DeprecationWarning) as info:
+            exec("x = {(yield 42) for i in j}", d)
+        assert str(info.value) == "'yield' inside set comprehension"
+        with raises(DeprecationWarning) as info:
+            exec("x = {(yield 42): blub for i in j}", d)
+        assert str(info.value) == "'yield' inside dict comprehension"
+
 
 class TestOptimizations:
     def count_instructions(self, source):
diff --git a/pypy/interpreter/test/test_compiler.py b/pypy/interpreter/test/test_compiler.py
--- a/pypy/interpreter/test/test_compiler.py
+++ b/pypy/interpreter/test/test_compiler.py
@@ -343,7 +343,6 @@
             assert ex.match(self.space, self.space.w_SyntaxError)
 
     def test_globals_warnings(self):
-        # also tests some other constructions that give a warning
         space = self.space
         w_mod = space.appexec((), '():\n import warnings\n return warnings\n') #sys.getmodule('warnings')
         w_filterwarnings = space.getattr(w_mod, space.wrap('filterwarnings'))
@@ -365,18 +364,6 @@
     print x
     x = 2
     global x
-''', '''
-def wrong_listcomp():
-    return [(yield 42) for i in j]
-''', '''
-def wrong_gencomp():
-    return ((yield 42) for i in j)
-''', '''
-def wrong_dictcomp():
-    return {(yield 42):2 for i in j}
-''', '''
-def wrong_setcomp():
-    return {(yield 42) for i in j}
 '''):
 
             space.call_args(w_filterwarnings, filter_arg)

From pypy.commits at gmail.com  Thu Jan 23 05:38:34 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 23 Jan 2020 02:38:34 -0800 (PST)
Subject: [pypy-commit] pypy default: Fix a corner case in multibytecodec:
 for stateful codecs, when encoding fails
Message-ID: <5e2977aa.1c69fb81.27f42.9810@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98571:2ed84f7866b6
Date: 2020-01-23 11:37 +0100
http://bitbucket.org/pypy/pypy/changeset/2ed84f7866b6/

Log:	Fix a corner case in multibytecodec: for stateful codecs, when
	encoding fails and we use replacement, the replacement string must
	be written in the output preserving the state.

diff --git a/pypy/module/_multibytecodec/c_codecs.py b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_codecs.py
+++ b/pypy/module/_multibytecodec/c_codecs.py
@@ -194,17 +194,23 @@
                                            rffi.SSIZE_T)
 pypy_cjk_enc_getcodec = llexternal('pypy_cjk_enc_getcodec',
                                    [ENCODEBUF_P], MULTIBYTECODEC_P)
+pypy_cjk_enc_copystate = llexternal('pypy_cjk_enc_copystate',
+                                    [ENCODEBUF_P, ENCODEBUF_P], lltype.Void)
 MBENC_FLUSH = 1
 MBENC_RESET = 2
 
 def encode(codec, unicodedata, length, errors="strict", errorcb=None,
-           namecb=None):
+           namecb=None, copystate=lltype.nullptr(ENCODEBUF_P.TO)):
     encodebuf = pypy_cjk_enc_new(codec)
     if not encodebuf:
         raise MemoryError
+    if copystate:
+        pypy_cjk_enc_copystate(encodebuf, copystate)
     try:
         return encodeex(encodebuf, unicodedata, length, errors, errorcb, namecb)
     finally:
+        if copystate:
+            pypy_cjk_enc_copystate(copystate, encodebuf)
         pypy_cjk_enc_free(encodebuf)
 
 def encodeex(encodebuf, utf8data, length, errors="strict", errorcb=None,
@@ -258,18 +264,18 @@
     elif errors == "ignore":
         replace = ""
     elif errors == "replace":
-        codec = pypy_cjk_enc_getcodec(encodebuf)
-        try:
-            replace = encode(codec, "?", 1)
-        except EncodeDecodeError:
-            replace = "?"
+        replace = "?"    # utf-8 unicode
     else:
         assert errorcb
-        rets, end = errorcb(errors, namecb, reason,
+        replace, end = errorcb(errors, namecb, reason,
                             unicodedata, start, end)
+    if len(replace) > 0:
         codec = pypy_cjk_enc_getcodec(encodebuf)
-        lgt = rutf8.codepoints_in_utf8(rets)
-        replace = encode(codec, rets, lgt, "strict", errorcb, namecb)
+        lgt = rutf8.codepoints_in_utf8(replace)
+        replace = encode(codec, replace, lgt, copystate=encodebuf)
+    #else:
+    #   replace is an empty utf-8 unicode, which we directly consider to
+    #   encode as an empty byte string.
     with rffi.scoped_nonmovingbuffer(replace) as inbuf:
         r = pypy_cjk_enc_replace_on_error(encodebuf, inbuf, len(replace), end)
     if r == MBERR_NOMEMORY:
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
@@ -135,6 +135,11 @@
   return d;
 }
 
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src)
+{
+    dst->state = src->state;
+}
+
 Py_ssize_t pypy_cjk_enc_init(struct pypy_cjk_enc_s *d,
                              Py_UNICODE *inbuf, Py_ssize_t inlen)
 {
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
@@ -146,6 +146,8 @@
                                       char *, pypymbc_ssize_t, pypymbc_ssize_t);
 RPY_EXTERN
 const MultibyteCodec *pypy_cjk_enc_getcodec(struct pypy_cjk_enc_s *);
+RPY_EXTERN
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src);
 
 /* list of codecs defined in the .c files */
 
diff --git a/pypy/module/_multibytecodec/test/test_app_codecs.py b/pypy/module/_multibytecodec/test/test_app_codecs.py
--- a/pypy/module/_multibytecodec/test/test_app_codecs.py
+++ b/pypy/module/_multibytecodec/test/test_app_codecs.py
@@ -110,3 +110,33 @@
                               lambda e: ('\xc3', e.end))
         raises(TypeError, u"\uDDA1".encode, "gbk",
                "test.test_encode_custom_error_handler_type")
+
+    def test_encode_replacement_with_state(self):
+        import codecs
+        s = u'\u4ee4\u477c\u4ee4'.encode("iso-2022-jp", errors="replace")
+        assert s == '\x1b$BNa\x1b(B?\x1b$BNa\x1b(B'
+
+    def test_streaming_codec(self):
+        test_0 = u'\uc5fc\u76d0\u5869\u9e7d\u477c\u4e3d/\u3012'
+        test_1 = u'\u4ee4\u477c\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b'
+        test_2 = u' foo = "Quoted string ****\u4ee4\u477c" '
+
+        ereplace = {'errors': 'replace'}
+        exml = {'errors': 'xmlcharrefreplace'}
+        for codec in ("iso-2022-jp", "iso-2022-jp-ext", "iso-2022-jp-1",
+                      "iso-2022-jp-2", "iso-2022-jp-3", "iso-2022-jp-2004",
+                      "iso-2022-kr",
+                     ):
+
+            out_1 = test_1.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_1.endswith(u'\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b')
+
+            out_0a = test_0.encode(codec, **ereplace).decode(codec, **ereplace)
+            for n, char in enumerate(out_0a):
+                assert char in (test_0[n], "?")
+
+            out_0b = test_0.encode(codec, **exml).decode(codec, **ereplace)
+            assert "䝼" in out_0b
+
+            out_2 = test_2.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_2.count('"') == 2

From pypy.commits at gmail.com  Thu Jan 23 05:52:15 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 23 Jan 2020 02:52:15 -0800 (PST)
Subject: [pypy-commit] pypy default: PyCodec_Encoder(), PyCodec_Decoder()
Message-ID: <5e297adf.1c69fb81.5e51b.8882@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98572:fb95321122db
Date: 2020-01-23 11:51 +0100
http://bitbucket.org/pypy/pypy/changeset/fb95321122db/

Log:	PyCodec_Encoder(), PyCodec_Decoder()

diff --git a/pypy/module/cpyext/codecs.py b/pypy/module/cpyext/codecs.py
--- a/pypy/module/cpyext/codecs.py
+++ b/pypy/module/cpyext/codecs.py
@@ -20,3 +20,12 @@
     else:
         return space.call_method(w_codec, "incrementaldecoder")
 
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Encoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(0))
+
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Decoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(1))
diff --git a/pypy/module/cpyext/test/test_codecs.py b/pypy/module/cpyext/test/test_codecs.py
--- a/pypy/module/cpyext/test/test_codecs.py
+++ b/pypy/module/cpyext/test/test_codecs.py
@@ -2,7 +2,8 @@
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from rpython.rtyper.lltypesystem import rffi
 from pypy.module.cpyext.codecs import (
-    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder)
+    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder,
+    PyCodec_Encoder, PyCodec_Decoder)
 
 class TestCodecs(BaseApiTest):
     def test_incremental(self, space):
@@ -13,3 +14,13 @@
         w_decoded = space.call_method(w_decoder, 'decode', w_encoded)
         assert space.utf8_w(w_decoded) == u'späm'.encode('utf8')
         rffi.free_charp(utf8)
+
+    def test_encoder_decoder(self, space):
+        utf8 = rffi.str2charp('utf-8')
+        w_encoder = PyCodec_Encoder(space, utf8)
+        w_decoder = PyCodec_Decoder(space, utf8)
+        rffi.free_charp(utf8)
+        space.appexec([w_encoder, w_decoder], """(encoder, decoder):
+            assert encoder(u"\u1234") == ('\xe1\x88\xb4', 1)
+            assert decoder("\xe1\x88\xb4") == (u'\u1234', 3)
+        """)

From pypy.commits at gmail.com  Thu Jan 23 06:02:22 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 23 Jan 2020 03:02:22 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: support async generator expressions in
 normal functions
Message-ID: <5e297d3e.1c69fb81.ae8dc.9df1@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98573:bde40d73c3de
Date: 2020-01-23 12:01 +0100
http://bitbucket.org/pypy/pypy/changeset/bde40d73c3de/

Log:	support async generator expressions in normal functions

diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -1569,10 +1569,6 @@
         code, qualname = self.sub_scope(sub_scope, name, node, node.lineno)
         is_async_generator = self.symbols.find_scope(node).is_coroutine
 
-        if is_async_generator and not is_async_function:
-            self.error("asynchronous comprehension outside of "
-                       "an asynchronous function", node)
-
         self.update_position(node.lineno)
         self._make_function(code, qualname=qualname)
         first_comp = node.get_generators()[0]
diff --git a/pypy/interpreter/test/apptest_coroutine.py b/pypy/interpreter/test/apptest_coroutine.py
--- a/pypy/interpreter/test/apptest_coroutine.py
+++ b/pypy/interpreter/test/apptest_coroutine.py
@@ -699,6 +699,20 @@
 
     assert run_async(run()) == ([], (1,))
 
+def test_async_genexpr_in_regular_function():
+    async def arange(n):
+        for i in range(n):
+            yield i
+
+    def make_arange(n):
+        # This syntax is legal starting with Python 3.7
+        return (i * 2 async for i in arange(n))
+
+    async def run():
+        return [i async for i in make_arange(10)]
+    res = run_async(run())
+    assert res[1] == [i * 2 for i in range(10)]
+
 # Helpers for test_async_gen_exception_11() below
 def sync_iterate(g):
     res = []

From pypy.commits at gmail.com  Thu Jan 23 06:31:32 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 23 Jan 2020 03:31:32 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: fix issue with @pytest.mark.pypy_only
Message-ID: <5e298414.1c69fb81.f06f1.93ec@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98574:deaa30ceb571
Date: 2020-01-23 12:30 +0100
http://bitbucket.org/pypy/pypy/changeset/deaa30ceb571/

Log:	fix issue with @pytest.mark.pypy_only

	before it would actually crash

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -71,6 +71,8 @@
     if mode_A:
         from pypy.tool.pytest.apptest import PythonInterpreter
         config.applevel = PythonInterpreter(config.option.python)
+    else:
+        config.applevel = None
 
 def pytest_addoption(parser):
     group = parser.getgroup("pypy options")
@@ -205,8 +207,9 @@
 def pytest_runtest_setup(item):
     if isinstance(item, py.test.collect.Function):
         config = item.config
-        if item.get_marker(name='pypy_only') and not config.applevel.is_pypy:
-            pytest.skip('PyPy-specific test')
+        if item.get_marker(name='pypy_only'):
+            if config.applevel is not None and not config.applevel.is_pypy:
+                pytest.skip('PyPy-specific test')
         appclass = item.getparent(py.test.Class)
         if appclass is not None:
             from pypy.tool.pytest.objspace import gettestobjspace

From pypy.commits at gmail.com  Thu Jan 23 07:21:01 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 23 Jan 2020 04:21:01 -0800 (PST)
Subject: [pypy-commit] pypy default: Test really just what we want to,
 i.e. that the message does not contain the
Message-ID: <5e298fad.1c69fb81.722c0.9eca@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98575:76b34bb85fe5
Date: 2020-01-23 13:07 +0100
http://bitbucket.org/pypy/pypy/changeset/76b34bb85fe5/

Log:	Test really just what we want to, i.e. that the message does not
	contain the word 'self'

diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -762,9 +762,9 @@
     def test_error_message_module_function(self):
         import operator # use repeat because it's defined at applevel
         exc = raises(TypeError, lambda : operator.repeat(1, 2, 3))
-        # does not contain the warning about missing self
-        # in particular it must not end with ' Did you forget 'self' in the function definition?'
-        assert str(exc.value).endswith("takes exactly 2 arguments (3 given)")
+        # does not contain the warning
+        # 'Did you forget 'self' in the function definition?'
+        assert 'self' not in str(exc.value)
 
     @pytest.mark.pypy_only
     def test_error_message_bound_method(self):

From pypy.commits at gmail.com  Thu Jan 23 07:21:08 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 23 Jan 2020 04:21:08 -0800 (PST)
Subject: [pypy-commit] pypy default: merge heads
Message-ID: <5e298fb4.1c69fb81.7be71.98a5@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r98576:a7c7b4c7dcae
Date: 2020-01-23 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/a7c7b4c7dcae/

Log:	merge heads

diff --git a/pypy/module/_multibytecodec/c_codecs.py b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_codecs.py
+++ b/pypy/module/_multibytecodec/c_codecs.py
@@ -194,17 +194,23 @@
                                            rffi.SSIZE_T)
 pypy_cjk_enc_getcodec = llexternal('pypy_cjk_enc_getcodec',
                                    [ENCODEBUF_P], MULTIBYTECODEC_P)
+pypy_cjk_enc_copystate = llexternal('pypy_cjk_enc_copystate',
+                                    [ENCODEBUF_P, ENCODEBUF_P], lltype.Void)
 MBENC_FLUSH = 1
 MBENC_RESET = 2
 
 def encode(codec, unicodedata, length, errors="strict", errorcb=None,
-           namecb=None):
+           namecb=None, copystate=lltype.nullptr(ENCODEBUF_P.TO)):
     encodebuf = pypy_cjk_enc_new(codec)
     if not encodebuf:
         raise MemoryError
+    if copystate:
+        pypy_cjk_enc_copystate(encodebuf, copystate)
     try:
         return encodeex(encodebuf, unicodedata, length, errors, errorcb, namecb)
     finally:
+        if copystate:
+            pypy_cjk_enc_copystate(copystate, encodebuf)
         pypy_cjk_enc_free(encodebuf)
 
 def encodeex(encodebuf, utf8data, length, errors="strict", errorcb=None,
@@ -258,18 +264,18 @@
     elif errors == "ignore":
         replace = ""
     elif errors == "replace":
-        codec = pypy_cjk_enc_getcodec(encodebuf)
-        try:
-            replace = encode(codec, "?", 1)
-        except EncodeDecodeError:
-            replace = "?"
+        replace = "?"    # utf-8 unicode
     else:
         assert errorcb
-        rets, end = errorcb(errors, namecb, reason,
+        replace, end = errorcb(errors, namecb, reason,
                             unicodedata, start, end)
+    if len(replace) > 0:
         codec = pypy_cjk_enc_getcodec(encodebuf)
-        lgt = rutf8.codepoints_in_utf8(rets)
-        replace = encode(codec, rets, lgt, "strict", errorcb, namecb)
+        lgt = rutf8.codepoints_in_utf8(replace)
+        replace = encode(codec, replace, lgt, copystate=encodebuf)
+    #else:
+    #   replace is an empty utf-8 unicode, which we directly consider to
+    #   encode as an empty byte string.
     with rffi.scoped_nonmovingbuffer(replace) as inbuf:
         r = pypy_cjk_enc_replace_on_error(encodebuf, inbuf, len(replace), end)
     if r == MBERR_NOMEMORY:
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
@@ -135,6 +135,11 @@
   return d;
 }
 
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src)
+{
+    dst->state = src->state;
+}
+
 Py_ssize_t pypy_cjk_enc_init(struct pypy_cjk_enc_s *d,
                              Py_UNICODE *inbuf, Py_ssize_t inlen)
 {
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
@@ -146,6 +146,8 @@
                                       char *, pypymbc_ssize_t, pypymbc_ssize_t);
 RPY_EXTERN
 const MultibyteCodec *pypy_cjk_enc_getcodec(struct pypy_cjk_enc_s *);
+RPY_EXTERN
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src);
 
 /* list of codecs defined in the .c files */
 
diff --git a/pypy/module/_multibytecodec/test/test_app_codecs.py b/pypy/module/_multibytecodec/test/test_app_codecs.py
--- a/pypy/module/_multibytecodec/test/test_app_codecs.py
+++ b/pypy/module/_multibytecodec/test/test_app_codecs.py
@@ -110,3 +110,33 @@
                               lambda e: ('\xc3', e.end))
         raises(TypeError, u"\uDDA1".encode, "gbk",
                "test.test_encode_custom_error_handler_type")
+
+    def test_encode_replacement_with_state(self):
+        import codecs
+        s = u'\u4ee4\u477c\u4ee4'.encode("iso-2022-jp", errors="replace")
+        assert s == '\x1b$BNa\x1b(B?\x1b$BNa\x1b(B'
+
+    def test_streaming_codec(self):
+        test_0 = u'\uc5fc\u76d0\u5869\u9e7d\u477c\u4e3d/\u3012'
+        test_1 = u'\u4ee4\u477c\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b'
+        test_2 = u' foo = "Quoted string ****\u4ee4\u477c" '
+
+        ereplace = {'errors': 'replace'}
+        exml = {'errors': 'xmlcharrefreplace'}
+        for codec in ("iso-2022-jp", "iso-2022-jp-ext", "iso-2022-jp-1",
+                      "iso-2022-jp-2", "iso-2022-jp-3", "iso-2022-jp-2004",
+                      "iso-2022-kr",
+                     ):
+
+            out_1 = test_1.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_1.endswith(u'\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b')
+
+            out_0a = test_0.encode(codec, **ereplace).decode(codec, **ereplace)
+            for n, char in enumerate(out_0a):
+                assert char in (test_0[n], "?")
+
+            out_0b = test_0.encode(codec, **exml).decode(codec, **ereplace)
+            assert "䝼" in out_0b
+
+            out_2 = test_2.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_2.count('"') == 2
diff --git a/pypy/module/cpyext/codecs.py b/pypy/module/cpyext/codecs.py
--- a/pypy/module/cpyext/codecs.py
+++ b/pypy/module/cpyext/codecs.py
@@ -20,3 +20,12 @@
     else:
         return space.call_method(w_codec, "incrementaldecoder")
 
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Encoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(0))
+
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Decoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(1))
diff --git a/pypy/module/cpyext/test/test_codecs.py b/pypy/module/cpyext/test/test_codecs.py
--- a/pypy/module/cpyext/test/test_codecs.py
+++ b/pypy/module/cpyext/test/test_codecs.py
@@ -2,7 +2,8 @@
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from rpython.rtyper.lltypesystem import rffi
 from pypy.module.cpyext.codecs import (
-    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder)
+    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder,
+    PyCodec_Encoder, PyCodec_Decoder)
 
 class TestCodecs(BaseApiTest):
     def test_incremental(self, space):
@@ -13,3 +14,13 @@
         w_decoded = space.call_method(w_decoder, 'decode', w_encoded)
         assert space.utf8_w(w_decoded) == u'späm'.encode('utf8')
         rffi.free_charp(utf8)
+
+    def test_encoder_decoder(self, space):
+        utf8 = rffi.str2charp('utf-8')
+        w_encoder = PyCodec_Encoder(space, utf8)
+        w_decoder = PyCodec_Decoder(space, utf8)
+        rffi.free_charp(utf8)
+        space.appexec([w_encoder, w_decoder], """(encoder, decoder):
+            assert encoder(u"\u1234") == ('\xe1\x88\xb4', 1)
+            assert decoder("\xe1\x88\xb4") == (u'\u1234', 3)
+        """)

From pypy.commits at gmail.com  Thu Jan 23 07:21:09 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 23 Jan 2020 04:21:09 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: hg merge default
Message-ID: <5e298fb5.1c69fb81.57f57.909b@mx.google.com>

Author: Armin Rigo 
Branch: py3.6
Changeset: r98577:be4941bb07ae
Date: 2020-01-23 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/be4941bb07ae/

Log:	hg merge default

diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -823,12 +823,12 @@
         # does not contain the warning about missing self
         assert exc.value.args[0] == "f0() takes 0 positional arguments but 1 was given"
 
-    @pytest.mark.pypy_only
     def test_error_message_module_function(self):
         import operator # use countOf because it's defined at applevel
         exc = raises(TypeError, lambda : operator.countOf(1, 2, 3))
-        # does not contain the warning about missing self
-        assert exc.value.args[0] == "countOf() takes 2 positional arguments but 3 were given"
+        # does not contain the warning
+        # 'Did you forget 'self' in the function definition?'
+        assert 'self' not in str(exc.value)
 
     @pytest.mark.pypy_only
     def test_error_message_bound_method(self):

From pypy.commits at gmail.com  Thu Jan 23 07:21:12 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 23 Jan 2020 04:21:12 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: hg merge default
Message-ID: <5e298fb8.1c69fb81.2a071.abeb@mx.google.com>

Author: Armin Rigo 
Branch: py3.6
Changeset: r98578:73d20edb41e9
Date: 2020-01-23 13:20 +0100
http://bitbucket.org/pypy/pypy/changeset/73d20edb41e9/

Log:	hg merge default

diff --git a/pypy/module/_multibytecodec/c_codecs.py b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_codecs.py
+++ b/pypy/module/_multibytecodec/c_codecs.py
@@ -194,17 +194,23 @@
                                            rffi.SSIZE_T)
 pypy_cjk_enc_getcodec = llexternal('pypy_cjk_enc_getcodec',
                                    [ENCODEBUF_P], MULTIBYTECODEC_P)
+pypy_cjk_enc_copystate = llexternal('pypy_cjk_enc_copystate',
+                                    [ENCODEBUF_P, ENCODEBUF_P], lltype.Void)
 MBENC_FLUSH = 1
 MBENC_RESET = 2
 
 def encode(codec, unicodedata, length, errors="strict", errorcb=None,
-           namecb=None):
+           namecb=None, copystate=lltype.nullptr(ENCODEBUF_P.TO)):
     encodebuf = pypy_cjk_enc_new(codec)
     if not encodebuf:
         raise MemoryError
+    if copystate:
+        pypy_cjk_enc_copystate(encodebuf, copystate)
     try:
         return encodeex(encodebuf, unicodedata, length, errors, errorcb, namecb)
     finally:
+        if copystate:
+            pypy_cjk_enc_copystate(copystate, encodebuf)
         pypy_cjk_enc_free(encodebuf)
 
 def encodeex(encodebuf, utf8data, length, errors="strict", errorcb=None,
@@ -257,22 +263,21 @@
         raise EncodeDecodeError(start, end, reason)
     elif errors == "ignore":
         replace = ""
+        rettype = 'b'   # != 'u'
     elif errors == "replace":
-        codec = pypy_cjk_enc_getcodec(encodebuf)
-        try:
-            replace = encode(codec, "?", 1)
-        except EncodeDecodeError:
-            replace = "?"
+        replace = "?"    # utf-8 unicode
+        rettype = 'u'
     else:
         assert errorcb
         replace, end, rettype = errorcb(errors, namecb, reason,
                             unicodedata, start, end)
-        if rettype == 'u':
-            codec = pypy_cjk_enc_getcodec(encodebuf)
-            lgt = rutf8.check_utf8(replace, False)
-            replace = encode(codec, replace, lgt)
-    lgt = len(replace)
+    if rettype == 'u':
+        codec = pypy_cjk_enc_getcodec(encodebuf)
+        lgt = rutf8.check_utf8(replace, False)
+        replace = encode(codec, replace, lgt, copystate=encodebuf)
+    #else:
+    #   replace is meant to be a byte string already
     with rffi.scoped_nonmovingbuffer(replace) as inbuf:
-        r = pypy_cjk_enc_replace_on_error(encodebuf, inbuf, lgt, end)
+        r = pypy_cjk_enc_replace_on_error(encodebuf, inbuf, len(replace), end)
     if r == MBERR_NOMEMORY:
         raise MemoryError
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
@@ -135,6 +135,11 @@
   return d;
 }
 
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src)
+{
+    dst->state = src->state;
+}
+
 Py_ssize_t pypy_cjk_enc_init(struct pypy_cjk_enc_s *d,
                              Py_UNICODE *inbuf, Py_ssize_t inlen)
 {
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
@@ -146,6 +146,8 @@
                                       char *, pypymbc_ssize_t, pypymbc_ssize_t);
 RPY_EXTERN
 const MultibyteCodec *pypy_cjk_enc_getcodec(struct pypy_cjk_enc_s *);
+RPY_EXTERN
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src);
 
 /* list of codecs defined in the .c files */
 
diff --git a/pypy/module/_multibytecodec/test/test_app_codecs.py b/pypy/module/_multibytecodec/test/test_app_codecs.py
--- a/pypy/module/_multibytecodec/test/test_app_codecs.py
+++ b/pypy/module/_multibytecodec/test/test_app_codecs.py
@@ -126,3 +126,33 @@
                               lambda e: (b'\xc3', e.end))
         result = "\uDDA1".encode("gbk", "test.test_encode_custom_error_handler_type")
         assert b'\xc3' in result
+
+    def test_encode_replacement_with_state(self):
+        import codecs
+        s = u'\u4ee4\u477c\u4ee4'.encode("iso-2022-jp", errors="replace")
+        assert s == b'\x1b$BNa\x1b(B?\x1b$BNa\x1b(B'
+
+    def test_streaming_codec(self):
+        test_0 = u'\uc5fc\u76d0\u5869\u9e7d\u477c\u4e3d/\u3012'
+        test_1 = u'\u4ee4\u477c\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b'
+        test_2 = u' foo = "Quoted string ****\u4ee4\u477c" '
+
+        ereplace = {'errors': 'replace'}
+        exml = {'errors': 'xmlcharrefreplace'}
+        for codec in ("iso-2022-jp", "iso-2022-jp-ext", "iso-2022-jp-1",
+                      "iso-2022-jp-2", "iso-2022-jp-3", "iso-2022-jp-2004",
+                      "iso-2022-kr",
+                     ):
+
+            out_1 = test_1.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_1.endswith(u'\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b')
+
+            out_0a = test_0.encode(codec, **ereplace).decode(codec, **ereplace)
+            for n, char in enumerate(out_0a):
+                assert char in (test_0[n], "?")
+
+            out_0b = test_0.encode(codec, **exml).decode(codec, **ereplace)
+            assert "䝼" in out_0b
+
+            out_2 = test_2.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_2.count('"') == 2
diff --git a/pypy/module/cpyext/codecs.py b/pypy/module/cpyext/codecs.py
--- a/pypy/module/cpyext/codecs.py
+++ b/pypy/module/cpyext/codecs.py
@@ -20,3 +20,12 @@
     else:
         return space.call_method(w_codec, "incrementaldecoder")
 
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Encoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(0))
+
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Decoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(1))
diff --git a/pypy/module/cpyext/test/test_codecs.py b/pypy/module/cpyext/test/test_codecs.py
--- a/pypy/module/cpyext/test/test_codecs.py
+++ b/pypy/module/cpyext/test/test_codecs.py
@@ -2,7 +2,8 @@
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from rpython.rtyper.lltypesystem import rffi
 from pypy.module.cpyext.codecs import (
-    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder)
+    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder,
+    PyCodec_Encoder, PyCodec_Decoder)
 
 class TestCodecs(BaseApiTest):
     def test_incremental(self, space):
@@ -13,3 +14,13 @@
         w_decoded = space.call_method(w_decoder, 'decode', w_encoded)
         assert space.utf8_w(w_decoded) == u'späm'.encode("utf-8")
         rffi.free_charp(utf8)
+
+    def test_encoder_decoder(self, space):
+        utf8 = rffi.str2charp('utf-8')
+        w_encoder = PyCodec_Encoder(space, utf8)
+        w_decoder = PyCodec_Decoder(space, utf8)
+        rffi.free_charp(utf8)
+        space.appexec([w_encoder, w_decoder], r"""(encoder, decoder):
+            assert encoder(u"\u1234") == (b"\xe1\x88\xb4", 1)
+            assert decoder(b"\xe1\x88\xb4") == (u"\u1234", 3)
+        """)

From pypy.commits at gmail.com  Fri Jan 24 06:32:26 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 24 Jan 2020 03:32:26 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: struct.format is now a str
Message-ID: <5e2ad5ca.1c69fb81.3b33c.25c4@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98579:ccd91dffdc19
Date: 2020-01-23 16:15 +0100
http://bitbucket.org/pypy/pypy/changeset/ccd91dffdc19/

Log:	struct.format is now a str

diff --git a/pypy/module/struct/interp_struct.py b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -215,7 +215,7 @@
 W_Struct.typedef = TypeDef("Struct",
     __new__=interp2app(W_Struct.descr__new__.im_func),
     __init__=interp2app(W_Struct.descr__init__),
-    format=interp_attrproperty("format", cls=W_Struct, wrapfn="newbytes"),
+    format=interp_attrproperty("format", cls=W_Struct, wrapfn="newtext"),
     size=interp_attrproperty("size", cls=W_Struct, wrapfn="newint"),
 
     pack=interp2app(W_Struct.descr_pack),
diff --git a/pypy/module/struct/test/test_struct.py b/pypy/module/struct/test/test_struct.py
--- a/pypy/module/struct/test/test_struct.py
+++ b/pypy/module/struct/test/test_struct.py
@@ -488,7 +488,7 @@
 
     def test_struct_object_attrib(self):
         s = self.struct.Struct('i')
-        assert s.format == b'i'
+        assert s.format == 'i'
 
     def test_trailing_counter(self):
         import array

From pypy.commits at gmail.com  Fri Jan 24 06:32:28 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 24 Jan 2020 03:32:28 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: implement register_at_fork
Message-ID: <5e2ad5cc.1c69fb81.df602.cb8a@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98580:b2176146ccf5
Date: 2020-01-24 11:48 +0100
http://bitbucket.org/pypy/pypy/changeset/b2176146ccf5/

Log:	implement register_at_fork

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -1393,6 +1393,89 @@
     pid, irrelevant = _run_forking_function(space, "F")
     return space.newint(pid)
 
+class ApplevelForkCallbacks(object):
+    def __init__(self, space):
+        self.space = space
+        self.before_w = []
+        self.parent_w = []
+        self.child_w = []
+
+ at unwrap_spec(w_before=WrappedDefault(None), w_after_in_parent=WrappedDefault(None),
+             w_after_in_child=WrappedDefault(None))
+def register_at_fork(space, __kwonly__, w_before, w_after_in_parent, w_after_in_child):
+    """
+    register_at_fork(...)
+    Register callables to be called when forking a new process.
+
+      before
+        A callable to be called in the parent before the fork() syscall.
+      after_in_child
+        A callable to be called in the child after fork().
+      after_in_parent
+        A callable to be called in the parent after fork().
+
+    'before' callbacks are called in reverse order.
+    'after_in_child' and 'after_in_parent' callbacks are called in order.
+    """
+    registered = False
+    cbs = space.fromcache(ApplevelForkCallbacks)
+    if not space.is_w(space.w_None, w_before):
+        if not space.callable_w(w_before):
+            raise oefmt(space.w_TypeError,
+                    "'before' must be callable, not %T",
+                    w_before)
+        cbs.before_w.append(w_before)
+        registered = True
+    if not space.is_w(space.w_None, w_after_in_parent):
+        if not space.callable_w(w_after_in_parent):
+            raise oefmt(space.w_TypeError,
+                    "'after_in_parent' must be callable, not %T",
+                    w_after_in_parent)
+        cbs.parent_w.append(w_after_in_parent)
+        registered = True
+    if not space.is_w(space.w_None, w_after_in_child):
+        if not space.callable_w(w_after_in_child):
+            raise oefmt(space.w_TypeError,
+                    "'after_in_child' must be callable, not %T",
+                    w_after_in_child)
+        cbs.child_w.append(w_after_in_child)
+        registered = True
+    if not registered:
+        raise oefmt(space.w_TypeError,
+            "At least one argument is required")
+
+
+def _run_applevel_hook(space, w_callable):
+    try:
+        space.call_function(w_callable)
+    except OperationError as e:
+        e.write_unraisable(space, "fork hook")
+
+def run_applevel_fork_hooks(space, l_w, reverse=False):
+    if not reverse:
+        for i in range(len(l_w)): # callable can append to the list
+            _run_applevel_hook(space, l_w[i])
+    else:
+        for i in range(len(l_w) - 1, -1, -1):
+            _run_applevel_hook(space, l_w[i])
+
+def run_applevel_fork_hooks_before(space):
+    cbs = space.fromcache(ApplevelForkCallbacks)
+    run_applevel_fork_hooks(space, cbs.before_w, reverse=True)
+
+def run_applevel_fork_hooks_parent(space):
+    cbs = space.fromcache(ApplevelForkCallbacks)
+    run_applevel_fork_hooks(space, cbs.parent_w)
+
+def run_applevel_fork_hooks_child(space):
+    cbs = space.fromcache(ApplevelForkCallbacks)
+    run_applevel_fork_hooks(space, cbs.child_w)
+
+add_fork_hook('before', run_applevel_fork_hooks_before)
+add_fork_hook('parent', run_applevel_fork_hooks_parent)
+add_fork_hook('child', run_applevel_fork_hooks_child)
+
+
 def openpty(space):
     "Open a pseudo-terminal, returning open fd's for both master and slave end."
     master_fd = slave_fd = -1
diff --git a/pypy/module/posix/moduledef.py b/pypy/module/posix/moduledef.py
--- a/pypy/module/posix/moduledef.py
+++ b/pypy/module/posix/moduledef.py
@@ -118,6 +118,7 @@
         interpleveldefs['readlink'] = 'interp_posix.readlink'
     if hasattr(os, 'fork'):
         interpleveldefs['fork'] = 'interp_posix.fork'
+        interpleveldefs['register_at_fork'] = 'interp_posix.register_at_fork'
     if hasattr(os, 'openpty'):
         interpleveldefs['openpty'] = 'interp_posix.openpty'
     if hasattr(os, 'forkpty'):
diff --git a/pypy/module/posix/test/apptest_posix.py b/pypy/module/posix/test/apptest_posix.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/posix/test/apptest_posix.py
@@ -0,0 +1,42 @@
+import pytest
+
+try:
+    import posix as os
+except ImportError:
+    pytest.skip("only for posix")
+
+if hasattr(os, "fork"):
+    def test_register_at_fork():
+        with pytest.raises(TypeError): # no args
+            os.register_at_fork()
+        with pytest.raises(TypeError): # positional args not supported
+            os.register_at_fork(lambda : 1)
+        with pytest.raises(TypeError): # not callable
+            os.register_at_fork(before=1)
+
+        # XXX this is unfortunately a small leak! all further tests that fork
+        # will call these callbacks and append four ints to l
+        l = [1]
+        os.register_at_fork(
+            before=lambda: l.append(2),
+            after_in_parent=lambda: l.append(5),
+            after_in_child=lambda: l.append(3))
+        def double_last():
+            l[-1] *= 2
+        os.register_at_fork(
+            before=lambda: l.append(4),
+            after_in_parent=lambda: l.append(-1),
+            after_in_child=double_last)
+        pid = os.fork()
+        if pid == 0:   # child
+            # l == [1, 4, 2, 6]
+            os._exit(sum(l))
+
+        assert l == [1, 4, 2, 5, -1]
+
+        pid1, status1 = os.waitpid(pid, 0)
+        assert pid1 == pid
+        assert os.WIFEXITED(status1)
+        res = os.WEXITSTATUS(status1)
+        assert res == 13
+

From pypy.commits at gmail.com  Fri Jan 24 06:32:30 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 24 Jan 2020 03:32:30 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: fix translation
Message-ID: <5e2ad5ce.1c69fb81.c27d5.db87@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98581:1401d76b3e8f
Date: 2020-01-24 12:22 +0100
http://bitbucket.org/pypy/pypy/changeset/1401d76b3e8f/

Log:	fix translation

diff --git a/pypy/interpreter/pytraceback.py b/pypy/interpreter/pytraceback.py
--- a/pypy/interpreter/pytraceback.py
+++ b/pypy/interpreter/pytraceback.py
@@ -70,7 +70,7 @@
         newnext = space.interp_w(PyTraceback, w_next, can_be_None=True)
         # check for loops
         curr = newnext
-        while curr is not None:
+        while curr is not None and isinstance(curr, PyTraceback):
             if curr is self:
                 raise oefmt(space.w_ValueError, 'traceback loop detected')
             curr = curr.next

From pypy.commits at gmail.com  Fri Jan 24 07:52:47 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 24 Jan 2020 04:52:47 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: need to do argument parsing slightly
 differently
Message-ID: <5e2ae89f.1c69fb81.27a0d.c318@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98582:b0ac9a40db7e
Date: 2020-01-24 13:51 +0100
http://bitbucket.org/pypy/pypy/changeset/b0ac9a40db7e/

Log:	need to do argument parsing slightly differently

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -1400,11 +1400,9 @@
         self.parent_w = []
         self.child_w = []
 
- at unwrap_spec(w_before=WrappedDefault(None), w_after_in_parent=WrappedDefault(None),
-             w_after_in_child=WrappedDefault(None))
-def register_at_fork(space, __kwonly__, w_before, w_after_in_parent, w_after_in_child):
+def register_at_fork(space, __args__):
     """
-    register_at_fork(...)
+    register_at_fork(*, [before], [after_in_child], [after_in_parent])
     Register callables to be called when forking a new process.
 
       before
@@ -1417,23 +1415,39 @@
     'before' callbacks are called in reverse order.
     'after_in_child' and 'after_in_parent' callbacks are called in order.
     """
+    # annoying, can't express argument parsing of this nicely
+    # because cpython explicitly wants
+    # os.register_at_fork(before=None, after_in_parent=)
+    # to fail, and we can't use unwrapped None as a kwonly default
+    args_w, kwargs_w = __args__.unpack()
+    if args_w:
+        raise oefmt(space.w_TypeError,
+            "register_at_fork() takes no positional arguments")
+    w_before = kwargs_w.pop("before", None)
+    w_after_in_parent = kwargs_w.pop("after_in_parent", None)
+    w_after_in_child = kwargs_w.pop("after_in_child", None)
+    if kwargs_w:
+        for key in kwargs_w:
+            raise oefmt(space.w_TypeError,
+                "%s is an invalid keyword argument for register_at_fork()", key)
+
     registered = False
     cbs = space.fromcache(ApplevelForkCallbacks)
-    if not space.is_w(space.w_None, w_before):
+    if w_before is not None:
         if not space.callable_w(w_before):
             raise oefmt(space.w_TypeError,
                     "'before' must be callable, not %T",
                     w_before)
         cbs.before_w.append(w_before)
         registered = True
-    if not space.is_w(space.w_None, w_after_in_parent):
+    if w_after_in_parent is not None:
         if not space.callable_w(w_after_in_parent):
             raise oefmt(space.w_TypeError,
                     "'after_in_parent' must be callable, not %T",
                     w_after_in_parent)
         cbs.parent_w.append(w_after_in_parent)
         registered = True
-    if not space.is_w(space.w_None, w_after_in_child):
+    if w_after_in_child is not None:
         if not space.callable_w(w_after_in_child):
             raise oefmt(space.w_TypeError,
                     "'after_in_child' must be callable, not %T",
@@ -1442,7 +1456,7 @@
         registered = True
     if not registered:
         raise oefmt(space.w_TypeError,
-            "At least one argument is required")
+            "At least one argument is required.")
 
 
 def _run_applevel_hook(space, w_callable):
diff --git a/pypy/module/posix/test/apptest_posix.py b/pypy/module/posix/test/apptest_posix.py
--- a/pypy/module/posix/test/apptest_posix.py
+++ b/pypy/module/posix/test/apptest_posix.py
@@ -13,14 +13,15 @@
             os.register_at_fork(lambda : 1)
         with pytest.raises(TypeError): # not callable
             os.register_at_fork(before=1)
+        with pytest.raises(TypeError): # wrong keyword
+            os.register_at_fork(a=1)
 
         # XXX this is unfortunately a small leak! all further tests that fork
         # will call these callbacks and append four ints to l
         l = [1]
-        os.register_at_fork(
-            before=lambda: l.append(2),
-            after_in_parent=lambda: l.append(5),
-            after_in_child=lambda: l.append(3))
+        os.register_at_fork(before=lambda: l.append(2))
+        os.register_at_fork(after_in_parent=lambda: l.append(5))
+        os.register_at_fork(after_in_child=lambda: l.append(3))
         def double_last():
             l[-1] *= 2
         os.register_at_fork(

From pypy.commits at gmail.com  Fri Jan 24 07:52:47 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 24 Jan 2020 04:52:47 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: need to do argument parsing slightly
 differently
Message-ID: <5e2ae89f.1c69fb81.27a0d.c318@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98582:b0ac9a40db7e
Date: 2020-01-24 13:51 +0100
http://bitbucket.org/pypy/pypy/changeset/b0ac9a40db7e/

Log:	need to do argument parsing slightly differently

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -1400,11 +1400,9 @@
         self.parent_w = []
         self.child_w = []
 
- at unwrap_spec(w_before=WrappedDefault(None), w_after_in_parent=WrappedDefault(None),
-             w_after_in_child=WrappedDefault(None))
-def register_at_fork(space, __kwonly__, w_before, w_after_in_parent, w_after_in_child):
+def register_at_fork(space, __args__):
     """
-    register_at_fork(...)
+    register_at_fork(*, [before], [after_in_child], [after_in_parent])
     Register callables to be called when forking a new process.
 
       before
@@ -1417,23 +1415,39 @@
     'before' callbacks are called in reverse order.
     'after_in_child' and 'after_in_parent' callbacks are called in order.
     """
+    # annoying, can't express argument parsing of this nicely
+    # because cpython explicitly wants
+    # os.register_at_fork(before=None, after_in_parent=)
+    # to fail, and we can't use unwrapped None as a kwonly default
+    args_w, kwargs_w = __args__.unpack()
+    if args_w:
+        raise oefmt(space.w_TypeError,
+            "register_at_fork() takes no positional arguments")
+    w_before = kwargs_w.pop("before", None)
+    w_after_in_parent = kwargs_w.pop("after_in_parent", None)
+    w_after_in_child = kwargs_w.pop("after_in_child", None)
+    if kwargs_w:
+        for key in kwargs_w:
+            raise oefmt(space.w_TypeError,
+                "%s is an invalid keyword argument for register_at_fork()", key)
+
     registered = False
     cbs = space.fromcache(ApplevelForkCallbacks)
-    if not space.is_w(space.w_None, w_before):
+    if w_before is not None:
         if not space.callable_w(w_before):
             raise oefmt(space.w_TypeError,
                     "'before' must be callable, not %T",
                     w_before)
         cbs.before_w.append(w_before)
         registered = True
-    if not space.is_w(space.w_None, w_after_in_parent):
+    if w_after_in_parent is not None:
         if not space.callable_w(w_after_in_parent):
             raise oefmt(space.w_TypeError,
                     "'after_in_parent' must be callable, not %T",
                     w_after_in_parent)
         cbs.parent_w.append(w_after_in_parent)
         registered = True
-    if not space.is_w(space.w_None, w_after_in_child):
+    if w_after_in_child is not None:
         if not space.callable_w(w_after_in_child):
             raise oefmt(space.w_TypeError,
                     "'after_in_child' must be callable, not %T",
@@ -1442,7 +1456,7 @@
         registered = True
     if not registered:
         raise oefmt(space.w_TypeError,
-            "At least one argument is required")
+            "At least one argument is required.")
 
 
 def _run_applevel_hook(space, w_callable):
diff --git a/pypy/module/posix/test/apptest_posix.py b/pypy/module/posix/test/apptest_posix.py
--- a/pypy/module/posix/test/apptest_posix.py
+++ b/pypy/module/posix/test/apptest_posix.py
@@ -13,14 +13,15 @@
             os.register_at_fork(lambda : 1)
         with pytest.raises(TypeError): # not callable
             os.register_at_fork(before=1)
+        with pytest.raises(TypeError): # wrong keyword
+            os.register_at_fork(a=1)
 
         # XXX this is unfortunately a small leak! all further tests that fork
         # will call these callbacks and append four ints to l
         l = [1]
-        os.register_at_fork(
-            before=lambda: l.append(2),
-            after_in_parent=lambda: l.append(5),
-            after_in_child=lambda: l.append(3))
+        os.register_at_fork(before=lambda: l.append(2))
+        os.register_at_fork(after_in_parent=lambda: l.append(5))
+        os.register_at_fork(after_in_child=lambda: l.append(3))
         def double_last():
             l[-1] *= 2
         os.register_at_fork(

From pypy.commits at gmail.com  Fri Jan 24 08:02:10 2020
From: pypy.commits at gmail.com (antocuni)
Date: Fri, 24 Jan 2020 05:02:10 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: fixed my dates
Message-ID: <5e2aead2.1c69fb81.8e2f6.f74a@mx.google.com>

Author: Antonio Cuni 
Branch: extradoc
Changeset: r5984:eaf11fb88172
Date: 2020-01-24 14:01 +0100
http://bitbucket.org/pypy/extradoc/changeset/eaf11fb88172/

Log:	fixed my dates

diff --git a/sprintinfo/leysin-winter-2020/people.txt b/sprintinfo/leysin-winter-2020/people.txt
--- a/sprintinfo/leysin-winter-2020/people.txt
+++ b/sprintinfo/leysin-winter-2020/people.txt
@@ -10,7 +10,7 @@
     Name              Arrive/Depart     Accomodation
 ==================== ============== =======================
 Armin Rigo                          private
-Antonio Cuni         flexible       Les Airelles, preferably single room
+Antonio Cuni         Feb 28-Mar 5   Les Airelles
 Omer Katz                           Les Airelles, big room
 Manuel Jacob         Feb 29–Mar 8   Les Airelles
 Simon Cross          Feb 27-Mar 6   Les Airelles, bringing partner

From pypy.commits at gmail.com  Sat Jan 25 10:10:37 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Sat, 25 Jan 2020 07:10:37 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: fix a bug in SimpleWeakSet: The weakref
 from the data set can already be dead.
Message-ID: <5e2c5a6d.1c69fb81.86381.fc1c@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98583:aa34f98b135c
Date: 2020-01-25 15:59 +0100
http://bitbucket.org/pypy/pypy/changeset/aa34f98b135c/

Log:	fix a bug in SimpleWeakSet: The weakref from the data set can
	already be dead.

	This can happen because (in PyPy at least) a weakref can be dead
	without its callback having been called yet. The bug caused very
	obscure test_collections.py failures.

	Unfortunately I completely failed to write a small test for the
	problem :-(.

diff --git a/pypy/module/_abc/app_abc.py b/pypy/module/_abc/app_abc.py
--- a/pypy/module/_abc/app_abc.py
+++ b/pypy/module/_abc/app_abc.py
@@ -24,7 +24,8 @@
         copy = list(self.data)
         for itemref in copy:
             item = itemref()
-            yield item
+            if item is not None:
+                yield item
 
     def __contains__(self, item):
         try:

From pypy.commits at gmail.com  Sat Jan 25 10:10:39 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Sat, 25 Jan 2020 07:10:39 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: improve error message,
 so that finding aa34f98b135c would have been simpler
Message-ID: <5e2c5a6f.1c69fb81.69c3a.0045@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98584:fd7960fb9618
Date: 2020-01-25 16:07 +0100
http://bitbucket.org/pypy/pypy/changeset/fd7960fb9618/

Log:	improve error message, so that finding aa34f98b135c would have been
	simpler

diff --git a/pypy/module/__builtin__/abstractinst.py b/pypy/module/__builtin__/abstractinst.py
--- a/pypy/module/__builtin__/abstractinst.py
+++ b/pypy/module/__builtin__/abstractinst.py
@@ -8,9 +8,10 @@
 """
 
 from rpython.rlib import jit
+from rpython.rlib.objectmodel import specialize
 
 from pypy.interpreter.baseobjspace import ObjSpace as BaseObjSpace
-from pypy.interpreter.error import OperationError
+from pypy.interpreter.error import OperationError, oefmt
 
 def _get_bases(space, w_cls):
     """Returns 'cls.__bases__'.  Returns None if there is
@@ -30,9 +31,11 @@
 def abstract_isclass_w(space, w_obj):
     return _get_bases(space, w_obj) is not None
 
+ at specialize.arg(2)
 def check_class(space, w_obj, msg):
     if not abstract_isclass_w(space, w_obj):
-        raise OperationError(space.w_TypeError, space.newtext(msg))
+        msg += ', got %T'
+        raise oefmt(space.w_TypeError, msg, w_obj)
 
 
 def abstract_getclass(space, w_obj):
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -271,3 +271,10 @@
             skip("non-normalized exception") #raise Special, ValueError()
         except Special:
             pass
+
+    def test_exception_contains_type_name(self):
+        with raises(TypeError) as e:
+            issubclass(type, None)
+        print(e.value)
+        assert "NoneType" in str(e.value)
+

From pypy.commits at gmail.com  Sun Jan 26 04:26:22 2020
From: pypy.commits at gmail.com (mattip)
Date: Sun, 26 Jan 2020 01:26:22 -0800 (PST)
Subject: [pypy-commit] pypy default: fix curses tests and make sure
 ffi.string returns str for python3
Message-ID: <5e2d5b3e.1c69fb81.222c9.f24f@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r98585:cad029326210
Date: 2020-01-26 08:36 +0200
http://bitbucket.org/pypy/pypy/changeset/cad029326210/

Log:	fix curses tests and make sure ffi.string returns str for python3

diff --git a/lib-python/2.7/test/test_curses.py b/lib-python/2.7/test/test_curses.py
--- a/lib-python/2.7/test/test_curses.py
+++ b/lib-python/2.7/test/test_curses.py
@@ -15,7 +15,8 @@
 import tempfile
 import unittest
 
-from test.test_support import requires, import_module, verbose, run_unittest
+from test.test_support import (requires, import_module, verbose, run_unittest,
+    cpython_only)
 
 # Optionally test curses module.  This currently requires that the
 # 'curses' resource be given on the regrtest command line using the -u
@@ -276,6 +277,7 @@
                                msg='userptr should fail since not set'):
             p.userptr()
 
+    @cpython_only
     def test_userptr_memory_leak(self):
         w = curses.newwin(10, 10)
         p = curses.panel.new_panel(w)
@@ -288,6 +290,7 @@
         self.assertEqual(sys.getrefcount(obj), nrefs,
                          "set_userptr leaked references")
 
+    @cpython_only
     def test_userptr_segfault(self):
         panel = curses.panel.new_panel(self.stdscr)
         class A:
diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -57,7 +57,7 @@
             if key_n == b"UNKNOWN KEY":
                 continue
             if not isinstance(key_n, str):   # python 3
-                key_n = key_n.decode()
+                key_n = key_n.decode('utf-8')
             key_n = key_n.replace('(', '').replace(')', '')
             globals()[key_n] = key
 
@@ -83,7 +83,9 @@
 
 
 def _ensure_initialised_color():
-    if not _initialised and _initialised_color:
+    if not _initialised:
+        raise error("must call initscr() first")
+    if not _initialised_color:
         raise error("must call start_color() first")
 
 
@@ -420,11 +422,16 @@
             val = lib.keyname(val)
             if val == ffi.NULL:
                 return ""
-            return ffi.string(val)
+            key_n = ffi.string(val)
+            if not isinstance(key_n, str):
+                key_n = key_n.decode('utf-8')
+            return key_n
 
     @_argspec(0, 1, 2)
     def getstr(self, y, x, n=1023):
         n = min(n, 1023)
+        if n < 0:
+            raise ValueError("'n' must be nonnegative")
         buf = ffi.new("char[1024]")  # /* This should be big enough.. I hope */
 
         if y is None:
@@ -467,6 +474,8 @@
     @_argspec(0, 1, 2)
     def instr(self, y, x, n=1023):
         n = min(n, 1023)
+        if n < 0:
+            raise ValueError("'n' must be nonnegative")
         buf = ffi.new("char[1024]")  # /* This should be big enough.. I hope */
         if y is None:
             code = lib.winnstr(self._win, buf, n)

From pypy.commits at gmail.com  Sun Jan 26 04:26:24 2020
From: pypy.commits at gmail.com (mattip)
Date: Sun, 26 Jan 2020 01:26:24 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: merge default into branch
Message-ID: <5e2d5b40.1c69fb81.86381.c68e@mx.google.com>

Author: Matti Picus 
Branch: py3.6
Changeset: r98586:aefd6cf46eed
Date: 2020-01-26 08:37 +0200
http://bitbucket.org/pypy/pypy/changeset/aefd6cf46eed/

Log:	merge default into branch

diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -57,7 +57,7 @@
             if key_n == b"UNKNOWN KEY":
                 continue
             if not isinstance(key_n, str):   # python 3
-                key_n = key_n.decode()
+                key_n = key_n.decode('utf-8')
             key_n = key_n.replace('(', '').replace(')', '')
             globals()[key_n] = key
 
@@ -83,7 +83,9 @@
 
 
 def _ensure_initialised_color():
-    if not _initialised and _initialised_color:
+    if not _initialised:
+        raise error("must call initscr() first")
+    if not _initialised_color:
         raise error("must call start_color() first")
 
 
@@ -434,11 +436,16 @@
             val = lib.keyname(val)
             if val == ffi.NULL:
                 return ""
-            return ffi.string(val)
+            key_n = ffi.string(val)
+            if not isinstance(key_n, str):
+                key_n = key_n.decode('utf-8')
+            return key_n
 
     @_argspec(0, 1, 2)
     def getstr(self, y, x, n=1023):
         n = min(n, 1023)
+        if n < 0:
+            raise ValueError("'n' must be nonnegative")
         buf = ffi.new("char[1024]")  # /* This should be big enough.. I hope */
 
         if y is None:
@@ -481,6 +488,8 @@
     @_argspec(0, 1, 2)
     def instr(self, y, x, n=1023):
         n = min(n, 1023)
+        if n < 0:
+            raise ValueError("'n' must be nonnegative")
         buf = ffi.new("char[1024]")  # /* This should be big enough.. I hope */
         if y is None:
             code = lib.winnstr(self._win, buf, n)

From pypy.commits at gmail.com  Sun Jan 26 04:26:26 2020
From: pypy.commits at gmail.com (mattip)
Date: Sun, 26 Jan 2020 01:26:26 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: fix _curses for py3.6
Message-ID: <5e2d5b42.1c69fb81.b0bdf.2f1e@mx.google.com>

Author: Matti Picus 
Branch: py3.6
Changeset: r98587:9265d2b9cef6
Date: 2020-01-26 11:25 +0200
http://bitbucket.org/pypy/pypy/changeset/9265d2b9cef6/

Log:	fix _curses for py3.6

diff --git a/lib-python/3/test/test_curses.py b/lib-python/3/test/test_curses.py
--- a/lib-python/3/test/test_curses.py
+++ b/lib-python/3/test/test_curses.py
@@ -15,7 +15,8 @@
 import tempfile
 import unittest
 
-from test.support import requires, import_module, verbose, SaveSignals
+from test.support import (requires, import_module, verbose, SaveSignals,
+        cpython_only)
 
 # Optionally test curses module.  This currently requires that the
 # 'curses' resource be given on the regrtest command line using the -u
@@ -315,6 +316,7 @@
                                msg='userptr should fail since not set'):
             p.userptr()
 
+    @cpython_only
     @requires_curses_func('panel')
     def test_userptr_memory_leak(self):
         w = curses.newwin(10, 10)
@@ -328,6 +330,7 @@
         self.assertEqual(sys.getrefcount(obj), nrefs,
                          "set_userptr leaked references")
 
+    @cpython_only
     @requires_curses_func('panel')
     def test_userptr_segfault(self):
         w = curses.newwin(10, 10)
@@ -420,20 +423,20 @@
         # we will need to rewrite this test.
         try:
             signature = inspect.signature(stdscr.addch)
-            self.assertFalse(signature)
         except ValueError:
-            # not generating a signature is fine.
-            pass
 
-        # So.  No signature for addch.
-        # But Argument Clinic gave us a human-readable equivalent
-        # as the first line of the docstring.  So we parse that,
-        # and ensure that the parameters appear in the correct order.
-        # Since this is parsing output from Argument Clinic, we can
-        # be reasonably certain the generated parsing code will be
-        # correct too.
-        human_readable_signature = stdscr.addch.__doc__.split("\n")[0]
-        self.assertIn("[y, x,]", human_readable_signature)
+            # So.  No signature for addch.
+            # But Argument Clinic gave us a human-readable equivalent
+            # as the first line of the docstring.  So we parse that,
+            # and ensure that the parameters appear in the correct order.
+            # Since this is parsing output from Argument Clinic, we can
+            # be reasonably certain the generated parsing code will be
+            # correct too.
+            human_readable_signature = stdscr.addch.__doc__.split("\n")[0]
+            self.assertIn("[y, x,]", human_readable_signature)
+        else:
+            params = list(signature.parameters.keys())
+            self.assertTrue(params.index('y') < params.index('x'))
 
     def test_issue13051(self):
         stdscr = self.stdscr
diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -4,6 +4,7 @@
 if sys.platform == 'win32':
     #This module does not exist in windows
     raise ImportError('No module named _curses')
+import locale
 from functools import wraps
 
 from _curses_cffi import ffi, lib
@@ -175,6 +176,40 @@
         raise TypeError("bytes or str expected, got a '%s' object"
                         % (type(text).__name__,))
 
+def _convert_to_chtype(win, obj):
+    if isinstance(obj, bytes) and len(obj) == 1:
+        value = ord(obj)
+    elif isinstance(obj, str):
+        if len(obj) != 1:
+            raise TypeError("expect bytes or str of length 1 or int, "
+                            "got a str of length %d", len(obj))
+        value = ord(obj)
+        if (128 < value):
+            if win:
+                encoding = win.encoding
+            else:
+                encoding = screen_encoding
+            b = obj.encode(encoding)
+            if len(bytes) == 1:
+                value = ord(b)
+            else:
+                OverflowError("byte doesn't fit in chtype")
+    elif isinstance(obj, int):
+        value = obj
+    else:
+        raise TypeError('expect bytes or str of length 1, or int, got %s' % type(obj))
+    return value
+
+def _convert_to_string(win, obj):
+    if isinstance(obj, str):
+        value = obj.encode(win.encoding)
+    elif isinstance(obj, bytes):
+        value = obj
+    else:
+        raise TypeError('expect bytes or str, got %s' % type(obj))
+    if b'\0' in value:
+        raise ValueError('embedded null character') 
+    return value
 
 def _extract_yx(args):
     if len(args) >= 2:
@@ -218,8 +253,17 @@
 
 
 class Window(object):
-    def __init__(self, window):
+    def __init__(self, window, encoding=None):
+        if encoding is None:
+            # CPython has a win32 branch here, but _curses is not supported
+            # on win32
+            codeset = locale.nl_langinfo(locale.CODESET)
+            if codeset:
+                encoding = codeset
+            else:
+                encoding = 'utf-8'
         self._win = window
+        self._encoding = encoding
 
     def __del__(self):
         if self._win != lib.stdscr:
@@ -288,7 +332,7 @@
 
     @_argspec(1, 1, 2)
     def addstr(self, y, x, text, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -302,7 +346,7 @@
 
     @_argspec(2, 1, 2)
     def addnstr(self, y, x, text, n, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -335,7 +379,15 @@
                     _chtype(tl), _chtype(tr), _chtype(bl), _chtype(br))
         return None
 
-    def box(self, vertint=0, horint=0):
+    def box(self, *args):
+        if len(args) == 0:
+            vertint = 0
+            horint = 0
+        elif len(args) == 2:
+            vertint = _convert_to_chtype(self, args[0])
+            horint = _convert_to_chtype(self, args[1])
+        else:
+            raise TypeError('verch,horch required')
         lib.box(self._win, vertint, horint)
         return None
 
@@ -502,7 +554,7 @@
 
     @_argspec(1, 1, 2)
     def insstr(self, y, x, text, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -516,7 +568,7 @@
 
     @_argspec(2, 1, 2)
     def insnstr(self, y, x, text, n, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -610,7 +662,7 @@
             win = lib.subpad(self._win, nlines, ncols, begin_y, begin_x)
         else:
             win = lib.subwin(self._win, nlines, ncols, begin_y, begin_x)
-        return Window(_check_NULL(win))
+        return Window(_check_NULL(win), self.encoding)
 
     def scroll(self, nlines=None):
         if nlines is None:
@@ -634,6 +686,23 @@
             _check_ERR(lib.wmove(self._win, y, x), "wmove")
         return _check_ERR(lib.wvline(self._win, ch | attr, n), "vline")
 
+    @property
+    def encoding(self):
+        return self._encoding
+
+    @encoding.setter
+    def encoding(self, val):
+        if not val:
+            raise TypeError('encoding may not be deleted')
+        if not isinstance(val, str):
+            raise TypeError('setting encoding to a non-string')
+        encoding = val.encode('ascii')
+        self._encoding = val 
+
+    @encoding.deleter
+    def encoding(self):
+        raise TypeError('encoding may not be deleted')
+        
 
 beep = _mk_no_return("beep")
 def_prog_mode = _mk_no_return("def_prog_mode")
@@ -821,7 +890,9 @@
     globals()["LINES"] = lib.LINES
     globals()["COLS"] = lib.COLS
 
-    return Window(win)
+    window = Window(win)
+    globals()['screen_encoding'] = window.encoding
+    return window
 
 
 def setupterm(term=None, fd=-1):
@@ -1030,7 +1101,13 @@
 
 def unget_wch(ch):
     _ensure_initialised()
-    return _check_ERR(lib.unget_wch(_chtype(ch)), "unget_wch")
+    if isinstance(ch, str):
+        if len(ch) != 1:
+            raise TypeError("expect bytes or str of length1, or int, "
+                            "got a str of length %d" % len(ch))
+    elif isinstance(ch, int): 
+        ch = chr(ch)
+    return _check_ERR(lib.unget_wch(ch), "unget_wch")
 
 
 def use_env(flag):

From pypy.commits at gmail.com  Sun Jan 26 05:13:15 2020
From: pypy.commits at gmail.com (mattip)
Date: Sun, 26 Jan 2020 02:13:15 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: issue 3159: venv should copy directories,
 not just files
Message-ID: <5e2d663b.1c69fb81.8f8f6.a08a@mx.google.com>

Author: Matti Picus 
Branch: py3.6
Changeset: r98588:39898aeb2799
Date: 2020-01-26 12:12 +0200
http://bitbucket.org/pypy/pypy/changeset/39898aeb2799/

Log:	issue 3159: venv should copy directories, not just files

diff --git a/lib-python/3/venv/__init__.py b/lib-python/3/venv/__init__.py
--- a/lib-python/3/venv/__init__.py
+++ b/lib-python/3/venv/__init__.py
@@ -196,7 +196,10 @@
                 logger.warning('Unable to symlink %r to %r', src, dst)
                 force_copy = True
         if force_copy:
-            shutil.copyfile(src, dst)
+            if os.path.isdir(src):
+                shutil.copytree(src, dst)
+            else:
+                shutil.copyfile(src, dst)
 
     def setup_python(self, context):
         """

From pypy.commits at gmail.com  Mon Jan 27 05:24:10 2020
From: pypy.commits at gmail.com (mattip)
Date: Mon, 27 Jan 2020 02:24:10 -0800 (PST)
Subject: [pypy-commit] buildbot default: add benchmark-results link for raw
 benchmark json files, add py3.7 to header
Message-ID: <5e2eba4a.1c69fb81.e7f49.b542@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r1128:f0a851a717e3
Date: 2020-01-27 11:44 +0200
http://bitbucket.org/pypy/buildbot/changeset/f0a851a717e3/

Log:	add benchmark-results link for raw benchmark json files, add py3.7
	to header

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -14,6 +14,7 @@
 from pypybuildbot.util import we_are_debugging, isRPython
 from buildbot.changes import filter
 from buildbot.changes.hgpoller import HgPoller
+from twisted.web.static import File
 
 # Forbid "force build" with empty user name
 class CustomForceScheduler(ForceScheduler):
@@ -91,6 +92,7 @@
 status.putChild('nightly', PyPyList(os.path.expanduser('~/nightly'),
                                     defaultType='application/octet-stream'))
 status.putChild('numpy-status', NumpyStatusList(os.path.expanduser('~/numpy_compat')))
+status.putChild('benchmark-results', File(os.path.expanduser('~/bench_results')))
 
 
 pypybuilds = load('pypybuildbot.builds')
diff --git a/master/templates/layout.html b/master/templates/layout.html
--- a/master/templates/layout.html
+++ b/master/templates/layout.html
@@ -24,10 +24,11 @@
     
    
         Home
         
-        - Speed
+        - 
         - 
         - Summary (trunk)
         - Summary (py3.6)
+        - Summary (py3.7)
         - Summary
         - RPython
         - Nightly builds
diff --git a/master/templates/root.html b/master/templates/root.html
--- a/master/templates/root.html
+++ b/master/templates/root.html
@@ -42,6 +42,11 @@
     The Nightly Build page contains precompiled PyPy
     binaries.
   
    • 
+  
  • 
+    The benchmark results page contains json
+    files from the benchmark runs, used for 
+    speed.pypy.org
+  
    • 
   
 
   
  • The Waterfall Display will give you a

From pypy.commits at gmail.com  Mon Jan 27 16:33:38 2020
From: pypy.commits at gmail.com (mattip)
Date: Mon, 27 Jan 2020 13:33:38 -0800 (PST)
Subject: [pypy-commit] buildbot default: branch was None by default
Message-ID: <5e2f5732.1c69fb81.98d92.09e3@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r1129:9984670940a2
Date: 2020-01-27 23:33 +0200
http://bitbucket.org/pypy/buildbot/changeset/9984670940a2/

Log:	branch was None by default

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -933,6 +933,8 @@
             exe = os.path.split(target)[-1][:-2]
             rev = props.getProperty('got_revision')
             branch = props.getProperty('branch')
+            if branch == 'None' or branch is None:
+                branch = 'default'
             command=["python", "runner.py", '--output-filename', 'result.json',
                      '--changed', target,
                      '--baseline', target,

From pypy.commits at gmail.com  Tue Jan 28 15:55:59 2020
From: pypy.commits at gmail.com (mattip)
Date: Tue, 28 Jan 2020 12:55:59 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: issue 3160: include structseq.h (needed
 for PyStructSequence_InitType2 in NumPy)
Message-ID: <5e309fdf.1c69fb81.5b32e.0446@mx.google.com>

Author: Matti Picus 
Branch: py3.6
Changeset: r98589:95ba888acdd6
Date: 2020-01-28 22:54 +0200
http://bitbucket.org/pypy/pypy/changeset/95ba888acdd6/

Log:	issue 3160: include structseq.h (needed for
	PyStructSequence_InitType2 in NumPy)

diff --git a/pypy/module/cpyext/include/Python.h b/pypy/module/cpyext/include/Python.h
--- a/pypy/module/cpyext/include/Python.h
+++ b/pypy/module/cpyext/include/Python.h
@@ -123,6 +123,7 @@
 #include "sliceobject.h"
 #include "genobject.h"
 #include "datetime.h"
+#include "structseq.h"
 #include "pystate.h"
 #include "fileobject.h"
 #include "pysignals.h"

From pypy.commits at gmail.com  Wed Jan 29 12:22:17 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 29 Jan 2020 09:22:17 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: add missing value to config_vars,
 from cibuildwheel PR #185
Message-ID: <5e31bf49.1c69fb81.3e520.dcfd@mx.google.com>

Author: Matti Picus 
Branch: py3.6
Changeset: r98590:cb567ed9c7ec
Date: 2020-01-29 19:21 +0200
http://bitbucket.org/pypy/pypy/changeset/cb567ed9c7ec/

Log:	add missing value to config_vars, from cibuildwheel PR #185

diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
--- a/lib_pypy/_sysconfigdata.py
+++ b/lib_pypy/_sysconfigdata.py
@@ -47,4 +47,5 @@
     build_time_vars['CC'] += ' -arch %s' % (arch,)
     if "CXX" in build_time_vars:
         build_time_vars['CXX'] += ' -arch %s' % (arch,)
+    build_time_vars['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
 

From pypy.commits at gmail.com  Wed Jan 29 13:59:20 2020
From: pypy.commits at gmail.com (stevie_92)
Date: Wed, 29 Jan 2020 10:59:20 -0800 (PST)
Subject: [pypy-commit] pypy cpyext-gc-cycle: Added rrc gc tests to improve
 code coverage
Message-ID: <5e31d608.1c69fb81.2c207.fafd@mx.google.com>

Author: Stefan Beyer 
Branch: cpyext-gc-cycle
Changeset: r98591:e8295913b0ef
Date: 2020-01-29 19:58 +0100
http://bitbucket.org/pypy/pypy/changeset/e8295913b0ef/

Log:	Added rrc gc tests to improve code coverage

diff --git a/rpython/memory/gc/test/dot/free_cpython_weakref_simple_1.dot b/rpython/memory/gc/test/dot/free_cpython_weakref_simple_4.dot
copy from rpython/memory/gc/test/dot/free_cpython_weakref_simple_1.dot
copy to rpython/memory/gc/test/dot/free_cpython_weakref_simple_4.dot
--- a/rpython/memory/gc/test/dot/free_cpython_weakref_simple_1.dot
+++ b/rpython/memory/gc/test/dot/free_cpython_weakref_simple_4.dot
@@ -1,7 +1,8 @@
 digraph G {
     "a" [type=C, alive=n];
     "b" [type=C, alive=n];
+    "c" [type=C, alive=n];
     "a" -> "b";
-    "b" -> "a";
+    "b" -> "c";
     "a" -> "b" [weakref=y, callback=y, clear_callback=y];
 }
diff --git a/rpython/memory/gc/test/dot/free_finalizer_simple_1a.dot b/rpython/memory/gc/test/dot/free_finalizer_simple_2.dot
copy from rpython/memory/gc/test/dot/free_finalizer_simple_1a.dot
copy to rpython/memory/gc/test/dot/free_finalizer_simple_2.dot
--- a/rpython/memory/gc/test/dot/free_finalizer_simple_1a.dot
+++ b/rpython/memory/gc/test/dot/free_finalizer_simple_2.dot
@@ -1,10 +1,10 @@
 digraph G {
-    "a" [type=P, alive=n];
-    "b" [type=B, alive=n];
+    "a" [type=C, alive=n];
+    "b" [type=C, alive=n];
     "c" [type=C, alive=n, finalizer=modern];
     "d" [type=C, alive=n];
-    "e" [type=B, alive=n];
-    "f" [type=P, alive=n];
+    "e" [type=C, alive=n];
+    "f" [type=C, alive=n];
     "a" -> "b";
     "b" -> "c";
     "c" -> "d";
diff --git a/rpython/memory/gc/test/dot/keep_cpython_inc_3b.dot b/rpython/memory/gc/test/dot/keep_cpython_inc_5.dot
copy from rpython/memory/gc/test/dot/keep_cpython_inc_3b.dot
copy to rpython/memory/gc/test/dot/keep_cpython_inc_5.dot
--- a/rpython/memory/gc/test/dot/keep_cpython_inc_3b.dot
+++ b/rpython/memory/gc/test/dot/keep_cpython_inc_5.dot
@@ -1,15 +1,10 @@
 digraph G {
     "a" [type=B, alive=y, ext_refcnt=1];
-    "b" [type=P, alive=n];
-    "c" [type=P, alive=y];
-    "d" [type=B, alive=y];
-    "e" [type=C, alive=y];
-    "f" [type=C, alive=y, ext_refcnt=1, added=after_snap];
-    "g" [type=B, alive=y, added=linked_after_snap, gc=n];
-    "a" -> "b" [removed=after_snap];
+    "b" [type=P, alive=y];
+    "c" [type=B, alive=y, added=linked_after_snap];
+    "d" [type=C, alive=y];
+    "a" -> "b";
     "b" -> "c";
-    "c" -> "d";
-    "d" -> "e";
-    "f" -> "g" [added=after_snap];
-    "g" -> "c" [added=after_snap];
+    "c" -> "d" [added=after_snap];
+    "d" -> "a";
 }
diff --git a/rpython/memory/gc/test/dot/keep_cpython_inc_3b.dot b/rpython/memory/gc/test/dot/keep_cpython_inc_6.dot
copy from rpython/memory/gc/test/dot/keep_cpython_inc_3b.dot
copy to rpython/memory/gc/test/dot/keep_cpython_inc_6.dot
--- a/rpython/memory/gc/test/dot/keep_cpython_inc_3b.dot
+++ b/rpython/memory/gc/test/dot/keep_cpython_inc_6.dot
@@ -1,15 +1,10 @@
 digraph G {
-    "a" [type=B, alive=y, ext_refcnt=1];
-    "b" [type=P, alive=n];
-    "c" [type=P, alive=y];
-    "d" [type=B, alive=y];
-    "e" [type=C, alive=y];
-    "f" [type=C, alive=y, ext_refcnt=1, added=after_snap];
-    "g" [type=B, alive=y, added=linked_after_snap, gc=n];
-    "a" -> "b" [removed=after_snap];
+    "a" [type=C, alive=y, ext_refcnt=1];
+    "b" [type=C, alive=y];
+    "c" [type=C, alive=y, removed=after_snap];
+    "d" [type=C, alive=n];
+    "a" -> "b";
     "b" -> "c";
-    "c" -> "d";
-    "d" -> "e";
-    "f" -> "g" [added=after_snap];
-    "g" -> "c" [added=after_snap];
+    "c" -> "d" [removed=after_snap];
+    "d" -> "a";
 }
diff --git a/rpython/memory/gc/test/dot/free_cpython_weakref_simple_1.dot b/rpython/memory/gc/test/dot/keep_cpython_weakref_simple_1.dot
copy from rpython/memory/gc/test/dot/free_cpython_weakref_simple_1.dot
copy to rpython/memory/gc/test/dot/keep_cpython_weakref_simple_1.dot
--- a/rpython/memory/gc/test/dot/free_cpython_weakref_simple_1.dot
+++ b/rpython/memory/gc/test/dot/keep_cpython_weakref_simple_1.dot
@@ -1,7 +1,10 @@
 digraph G {
-    "a" [type=C, alive=n];
-    "b" [type=C, alive=n];
+    "a" [type=C, alive=y, ext_refcnt=1];
+    "b" [type=C, alive=y];
+    "c" [type=C, alive=n];
+    "d" [type=C, alive=n];
     "a" -> "b";
-    "b" -> "a";
-    "a" -> "b" [weakref=y, callback=y, clear_callback=y];
+    "c" -> "d";
+    "d" -> "c";
+    "b" -> "c" [weakref=y, callback=y, clear_callback=n];
 }
diff --git a/rpython/memory/gc/test/test_rawrefcount.py b/rpython/memory/gc/test/test_rawrefcount.py
--- a/rpython/memory/gc/test/test_rawrefcount.py
+++ b/rpython/memory/gc/test/test_rawrefcount.py
@@ -25,18 +25,57 @@
                          ('prev', lltype.Ptr(S)),
                          ('next', lltype.Ptr(S))))
 
-
 class TestRawRefCount(BaseDirectGCTest):
     GCClass = IncMiniMark
     RRCGCClass = RawRefCountIncMarkGC
     #RRCGCClass = RawRefCountMarkGC
 
+    # do cleanup after collection (clear all dead pyobjects)
+    def finalize_modern(self, pyobj):
+        index = self.pyobjs.index(pyobj)
+        if not self.pyobj_finalizer.has_key(index) or \
+                self.pyobj_finalizer[index] != \
+                RAWREFCOUNT_FINALIZER_MODERN:
+            return
+        if self.pyobj_finalized.has_key(index):
+            return
+        self.pyobj_finalized[index] = True
+        if self.pyobj_resurrect.has_key(index):
+            resurrect = self.pyobj_resurrect[index]
+            for r in resurrect:
+                r.c_ob_refcnt += 1
+        if self.pyobj_delete.has_key(index):
+            delete = self.pyobj_delete[index]
+            for r in delete:
+                self.pyobj_refs[index].remove(r)
+                self.decref(r, None)
+
+    def decref_children(self, pyobj):
+        self.gc.rrc_gc.tp_traverse(pyobj, self.decref, None)
+
+    def decref(self, pyobj, ignore):
+        pyobj.c_ob_refcnt -= 1
+        if pyobj.c_ob_refcnt == 0:
+            self.finalize_modern(pyobj)
+        if pyobj.c_ob_refcnt == 0:
+            gchdr = self.gc.rrc_gc.pyobj_as_gc(pyobj)
+            if gchdr != lltype.nullptr(PYOBJ_GC_HDR) and \
+                    gchdr.c_gc_refs != RAWREFCOUNT_REFS_UNTRACKED:
+                next = gchdr.c_gc_next
+                next.c_gc_prev = gchdr.c_gc_prev
+                gchdr.c_gc_prev.c_gc_next = next
+            self.decref_children(pyobj)
+            self.pyobjs[self.pyobjs.index(pyobj)] = \
+                lltype.nullptr(PYOBJ_HDR_PTR.TO)
+            lltype.free(pyobj, flavor='raw')
+
     def setup_method(self, method):
         BaseDirectGCTest.setup_method(self, method)
 
         self.trigger = []
         self.gcobjs = []
         self.pyobjs = []
+        self.pyobjs_removed_count = []
         self.pyobj_refs = []
         self.pyobj_weakrefs = []
         self.pyobj_finalizer = {}
@@ -123,6 +162,14 @@
         refs.append(pyobj_to)
         pyobj_to.c_ob_refcnt += 1
 
+    def _rawrefcount_removeref(self, pyobj_from, pyobj_to):
+        refs = self.pyobj_refs[self.pyobjs.index(pyobj_from)]
+        refs.remove(pyobj_to)
+        self.decref(pyobj_to, None)
+
+    def _get_removed_count(self, pyobj):
+        return self.pyobjs_removed_count[self.pyobjs.index(pyobj)]
+
     def _rawrefcount_addweakref(self, pyobj_from, weakref):
         refs = self.pyobj_weakrefs[self.pyobjs.index(pyobj_from)]
         refs.append(weakref)
@@ -169,6 +216,7 @@
         self.tupletypes.append(tuple_type)
 
         self.pyobjs.append(r1)
+        self.pyobjs_removed_count.append(0)
         self.is_pygc.append(is_gc)
         self.pyobj_refs.append([])
         self.pyobj_weakrefs.append([])
@@ -220,6 +268,7 @@
         self.tupletypes.append(tuple_type)
 
         self.pyobjs.append(r1)
+        self.pyobjs_removed_count.append(0)
         self.is_pygc.append(is_gc)
         self.pyobj_refs.append([])
         self.pyobj_weakrefs.append([])
@@ -729,44 +778,12 @@
         garbage_pypy = []
         garbage_pyobj = []
         def cleanup():
-            # do cleanup after collection (clear all dead pyobjects)
-            def finalize_modern(pyobj):
-                index = self.pyobjs.index(pyobj)
-                if not self.pyobj_finalizer.has_key(index) or \
-                    self.pyobj_finalizer[index] != \
-                        RAWREFCOUNT_FINALIZER_MODERN:
-                    return
-                if self.pyobj_finalized.has_key(index):
-                    return
-                self.pyobj_finalized[index] = True
-                if self.pyobj_resurrect.has_key(index):
-                    resurrect = self.pyobj_resurrect[index]
-                    for r in resurrect:
-                        r.c_ob_refcnt += 1
-                if self.pyobj_delete.has_key(index):
-                    delete = self.pyobj_delete[index]
-                    for r in delete:
-                        self.pyobj_refs[index].remove(r)
-                        decref(r, None)
-
-            def decref_children(pyobj):
-                self.gc.rrc_gc.tp_traverse(pyobj, decref, None)
 
             def decref(pyobj, ignore):
-                pyobj.c_ob_refcnt -= 1
-                if pyobj.c_ob_refcnt == 0:
-                    finalize_modern(pyobj)
-                if pyobj.c_ob_refcnt == 0:
-                    gchdr = self.gc.rrc_gc.pyobj_as_gc(pyobj)
-                    if gchdr != lltype.nullptr(PYOBJ_GC_HDR) and \
-                        gchdr.c_gc_refs != RAWREFCOUNT_REFS_UNTRACKED:
-                        next = gchdr.c_gc_next
-                        next.c_gc_prev = gchdr.c_gc_prev
-                        gchdr.c_gc_prev.c_gc_next = next
-                    decref_children(pyobj)
-                    self.pyobjs[self.pyobjs.index(pyobj)] = \
-                        lltype.nullptr(PYOBJ_HDR_PTR.TO)
-                    lltype.free(pyobj, flavor='raw')
+                self.decref(pyobj, ignore)
+
+            def finalize_modern(pyobj):
+                self.finalize_modern(pyobj)
 
             next_dead = self.gc.rawrefcount_next_dead()
             while next_dead <> llmemory.NULL:
@@ -901,8 +918,11 @@
                             remove[2].p.prev = remove[2].p
                         else:
                             assert False, "not yet supported"
-                    else:
-                        assert False, "not yet supported"
+                    elif remove[0] == "C":
+                        source = remove[1]
+                        dest = remove[2]
+                        self._rawrefcount_removeref(source.r, dest.r)
+
                 after_snap = True
 
         self.gc.rrc_gc.invoke_callback()
@@ -925,7 +945,8 @@
                 if n.info.type == "P":
                     n.check_alive()
                 else:
-                    n.check_alive(n.info.ext_refcnt)
+                    removed_refs = self._get_removed_count(n.r)
+                    n.check_alive(n.info.ext_refcnt - removed_refs)
                 print "Node", name, "is alive."
             else:
                 print "Node", name, "should be dead."

From pypy.commits at gmail.com  Wed Jan 29 15:08:49 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 29 Jan 2020 12:08:49 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.6 into branch
Message-ID: <5e31e651.1c69fb81.9802.0c6a@mx.google.com>

Author: Matti Picus 
Branch: py3.7
Changeset: r98594:55e4d78197be
Date: 2020-01-29 22:05 +0200
http://bitbucket.org/pypy/pypy/changeset/55e4d78197be/

Log:	merge py3.6 into branch

diff --git a/lib-python/3/test/test_curses.py b/lib-python/3/test/test_curses.py
--- a/lib-python/3/test/test_curses.py
+++ b/lib-python/3/test/test_curses.py
@@ -15,7 +15,8 @@
 import tempfile
 import unittest
 
-from test.support import requires, import_module, verbose, SaveSignals
+from test.support import (requires, import_module, verbose, SaveSignals,
+        cpython_only)
 
 # Optionally test curses module.  This currently requires that the
 # 'curses' resource be given on the regrtest command line using the -u
@@ -315,6 +316,7 @@
                                msg='userptr should fail since not set'):
             p.userptr()
 
+    @cpython_only
     @requires_curses_func('panel')
     def test_userptr_memory_leak(self):
         w = curses.newwin(10, 10)
@@ -328,6 +330,7 @@
         self.assertEqual(sys.getrefcount(obj), nrefs,
                          "set_userptr leaked references")
 
+    @cpython_only
     @requires_curses_func('panel')
     def test_userptr_segfault(self):
         w = curses.newwin(10, 10)
@@ -420,20 +423,20 @@
         # we will need to rewrite this test.
         try:
             signature = inspect.signature(stdscr.addch)
-            self.assertFalse(signature)
         except ValueError:
-            # not generating a signature is fine.
-            pass
 
-        # So.  No signature for addch.
-        # But Argument Clinic gave us a human-readable equivalent
-        # as the first line of the docstring.  So we parse that,
-        # and ensure that the parameters appear in the correct order.
-        # Since this is parsing output from Argument Clinic, we can
-        # be reasonably certain the generated parsing code will be
-        # correct too.
-        human_readable_signature = stdscr.addch.__doc__.split("\n")[0]
-        self.assertIn("[y, x,]", human_readable_signature)
+            # So.  No signature for addch.
+            # But Argument Clinic gave us a human-readable equivalent
+            # as the first line of the docstring.  So we parse that,
+            # and ensure that the parameters appear in the correct order.
+            # Since this is parsing output from Argument Clinic, we can
+            # be reasonably certain the generated parsing code will be
+            # correct too.
+            human_readable_signature = stdscr.addch.__doc__.split("\n")[0]
+            self.assertIn("[y, x,]", human_readable_signature)
+        else:
+            params = list(signature.parameters.keys())
+            self.assertTrue(params.index('y') < params.index('x'))
 
     def test_issue13051(self):
         stdscr = self.stdscr
diff --git a/lib-python/3/venv/__init__.py b/lib-python/3/venv/__init__.py
--- a/lib-python/3/venv/__init__.py
+++ b/lib-python/3/venv/__init__.py
@@ -187,6 +187,9 @@
                     logger.warning('Unable to symlink %r to %r', src, dst)
                     force_copy = True
             if force_copy:
+            if os.path.isdir(src):
+                shutil.copytree(src, dst)
+            else:
                 shutil.copyfile(src, dst)
     else:
         def symlink_or_copy(self, src, dst, relative_symlinks_ok=False):
diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -4,6 +4,7 @@
 if sys.platform == 'win32':
     #This module does not exist in windows
     raise ImportError('No module named _curses')
+import locale
 from functools import wraps
 
 from _curses_cffi import ffi, lib
@@ -57,7 +58,7 @@
             if key_n == b"UNKNOWN KEY":
                 continue
             if not isinstance(key_n, str):   # python 3
-                key_n = key_n.decode()
+                key_n = key_n.decode('utf-8')
             key_n = key_n.replace('(', '').replace(')', '')
             globals()[key_n] = key
 
@@ -83,7 +84,9 @@
 
 
 def _ensure_initialised_color():
-    if not _initialised and _initialised_color:
+    if not _initialised:
+        raise error("must call initscr() first")
+    if not _initialised_color:
         raise error("must call start_color() first")
 
 
@@ -173,6 +176,40 @@
         raise TypeError("bytes or str expected, got a '%s' object"
                         % (type(text).__name__,))
 
+def _convert_to_chtype(win, obj):
+    if isinstance(obj, bytes) and len(obj) == 1:
+        value = ord(obj)
+    elif isinstance(obj, str):
+        if len(obj) != 1:
+            raise TypeError("expect bytes or str of length 1 or int, "
+                            "got a str of length %d", len(obj))
+        value = ord(obj)
+        if (128 < value):
+            if win:
+                encoding = win.encoding
+            else:
+                encoding = screen_encoding
+            b = obj.encode(encoding)
+            if len(bytes) == 1:
+                value = ord(b)
+            else:
+                OverflowError("byte doesn't fit in chtype")
+    elif isinstance(obj, int):
+        value = obj
+    else:
+        raise TypeError('expect bytes or str of length 1, or int, got %s' % type(obj))
+    return value
+
+def _convert_to_string(win, obj):
+    if isinstance(obj, str):
+        value = obj.encode(win.encoding)
+    elif isinstance(obj, bytes):
+        value = obj
+    else:
+        raise TypeError('expect bytes or str, got %s' % type(obj))
+    if b'\0' in value:
+        raise ValueError('embedded null character') 
+    return value
 
 def _extract_yx(args):
     if len(args) >= 2:
@@ -216,8 +253,17 @@
 
 
 class Window(object):
-    def __init__(self, window):
+    def __init__(self, window, encoding=None):
+        if encoding is None:
+            # CPython has a win32 branch here, but _curses is not supported
+            # on win32
+            codeset = locale.nl_langinfo(locale.CODESET)
+            if codeset:
+                encoding = codeset
+            else:
+                encoding = 'utf-8'
         self._win = window
+        self._encoding = encoding
 
     def __del__(self):
         if self._win != lib.stdscr:
@@ -286,7 +332,7 @@
 
     @_argspec(1, 1, 2)
     def addstr(self, y, x, text, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -300,7 +346,7 @@
 
     @_argspec(2, 1, 2)
     def addnstr(self, y, x, text, n, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -333,7 +379,15 @@
                     _chtype(tl), _chtype(tr), _chtype(bl), _chtype(br))
         return None
 
-    def box(self, vertint=0, horint=0):
+    def box(self, *args):
+        if len(args) == 0:
+            vertint = 0
+            horint = 0
+        elif len(args) == 2:
+            vertint = _convert_to_chtype(self, args[0])
+            horint = _convert_to_chtype(self, args[1])
+        else:
+            raise TypeError('verch,horch required')
         lib.box(self._win, vertint, horint)
         return None
 
@@ -434,11 +488,16 @@
             val = lib.keyname(val)
             if val == ffi.NULL:
                 return ""
-            return ffi.string(val)
+            key_n = ffi.string(val)
+            if not isinstance(key_n, str):
+                key_n = key_n.decode('utf-8')
+            return key_n
 
     @_argspec(0, 1, 2)
     def getstr(self, y, x, n=1023):
         n = min(n, 1023)
+        if n < 0:
+            raise ValueError("'n' must be nonnegative")
         buf = ffi.new("char[1024]")  # /* This should be big enough.. I hope */
 
         if y is None:
@@ -481,6 +540,8 @@
     @_argspec(0, 1, 2)
     def instr(self, y, x, n=1023):
         n = min(n, 1023)
+        if n < 0:
+            raise ValueError("'n' must be nonnegative")
         buf = ffi.new("char[1024]")  # /* This should be big enough.. I hope */
         if y is None:
             code = lib.winnstr(self._win, buf, n)
@@ -493,7 +554,7 @@
 
     @_argspec(1, 1, 2)
     def insstr(self, y, x, text, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -507,7 +568,7 @@
 
     @_argspec(2, 1, 2)
     def insnstr(self, y, x, text, n, attr=None):
-        text = _bytestype(text)
+        text = _convert_to_string(self, text)
         if attr is not None:
             attr_old = lib.getattrs(self._win)
             lib.wattrset(self._win, attr)
@@ -601,7 +662,7 @@
             win = lib.subpad(self._win, nlines, ncols, begin_y, begin_x)
         else:
             win = lib.subwin(self._win, nlines, ncols, begin_y, begin_x)
-        return Window(_check_NULL(win))
+        return Window(_check_NULL(win), self.encoding)
 
     def scroll(self, nlines=None):
         if nlines is None:
@@ -625,6 +686,23 @@
             _check_ERR(lib.wmove(self._win, y, x), "wmove")
         return _check_ERR(lib.wvline(self._win, ch | attr, n), "vline")
 
+    @property
+    def encoding(self):
+        return self._encoding
+
+    @encoding.setter
+    def encoding(self, val):
+        if not val:
+            raise TypeError('encoding may not be deleted')
+        if not isinstance(val, str):
+            raise TypeError('setting encoding to a non-string')
+        encoding = val.encode('ascii')
+        self._encoding = val 
+
+    @encoding.deleter
+    def encoding(self):
+        raise TypeError('encoding may not be deleted')
+        
 
 beep = _mk_no_return("beep")
 def_prog_mode = _mk_no_return("def_prog_mode")
@@ -812,7 +890,9 @@
     globals()["LINES"] = lib.LINES
     globals()["COLS"] = lib.COLS
 
-    return Window(win)
+    window = Window(win)
+    globals()['screen_encoding'] = window.encoding
+    return window
 
 
 def setupterm(term=None, fd=-1):
@@ -1021,7 +1101,13 @@
 
 def unget_wch(ch):
     _ensure_initialised()
-    return _check_ERR(lib.unget_wch(_chtype(ch)), "unget_wch")
+    if isinstance(ch, str):
+        if len(ch) != 1:
+            raise TypeError("expect bytes or str of length1, or int, "
+                            "got a str of length %d" % len(ch))
+    elif isinstance(ch, int): 
+        ch = chr(ch)
+    return _check_ERR(lib.unget_wch(ch), "unget_wch")
 
 
 def use_env(flag):
diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
--- a/lib_pypy/_sysconfigdata.py
+++ b/lib_pypy/_sysconfigdata.py
@@ -47,4 +47,5 @@
     build_time_vars['CC'] += ' -arch %s' % (arch,)
     if "CXX" in build_time_vars:
         build_time_vars['CXX'] += ' -arch %s' % (arch,)
+    build_time_vars['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
 
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -68,6 +68,11 @@
     if not mode_A and not mode_D:  # 'own' tests
         from rpython.conftest import LeakFinder
         config.pluginmanager.register(LeakFinder())
+    if mode_A:
+        from pypy.tool.pytest.apptest import PythonInterpreter
+        config.applevel = PythonInterpreter(config.option.python)
+    else:
+        config.applevel = None
 
 def pytest_addoption(parser):
     group = parser.getgroup("pypy options")
@@ -201,13 +206,17 @@
 @pytest.hookimpl(tryfirst=True)
 def pytest_runtest_setup(item):
     if isinstance(item, py.test.collect.Function):
+        config = item.config
+        if item.get_marker(name='pypy_only'):
+            if config.applevel is not None and not config.applevel.is_pypy:
+                pytest.skip('PyPy-specific test')
         appclass = item.getparent(py.test.Class)
         if appclass is not None:
             from pypy.tool.pytest.objspace import gettestobjspace
             # Make cls.space and cls.runappdirect available in tests.
             spaceconfig = getattr(appclass.obj, 'spaceconfig', {})
             appclass.obj.space = gettestobjspace(**spaceconfig)
-            appclass.obj.runappdirect = option.runappdirect
+            appclass.obj.runappdirect = config.option.runappdirect
 
 def pytest_ignore_collect(path, config):
     if (config.getoption('direct_apptest') and not path.isdir()
diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -806,7 +806,7 @@
         exc = raises(TypeError, '(lambda *, kw: 0)(1, kw=3)')
         assert str(exc.value) == "() takes 0 positional arguments but 1 positional argument (and 1 keyword-only argument) were given"
 
-    @py.test.mark.skipif("config.option.runappdirect")
+    @pytest.mark.pypy_only
     def test_error_message_method(self):
         class A(object):
             def f0():
@@ -823,14 +823,14 @@
         # does not contain the warning about missing self
         assert exc.value.args[0] == "f0() takes 0 positional arguments but 1 was given"
 
-    @py.test.mark.skipif("config.option.runappdirect")
     def test_error_message_module_function(self):
         import operator # use countOf because it's defined at applevel
         exc = raises(TypeError, lambda : operator.countOf(1, 2, 3))
-        # does not contain the warning about missing self
-        assert exc.value.args[0] == "countOf() takes 2 positional arguments but 3 were given"
+        # does not contain the warning
+        # 'Did you forget 'self' in the function definition?'
+        assert 'self' not in str(exc.value)
 
-    @py.test.mark.skipif("config.option.runappdirect")
+    @pytest.mark.pypy_only
     def test_error_message_bound_method(self):
         class A(object):
             def f0():
diff --git a/pypy/module/__builtin__/test/test_abstractinst.py b/pypy/module/__builtin__/test/test_abstractinst.py
--- a/pypy/module/__builtin__/test/test_abstractinst.py
+++ b/pypy/module/__builtin__/test/test_abstractinst.py
@@ -215,7 +215,7 @@
 
     def test_dont_call_instancecheck_fast_path(self):
         called = []
-        
+
         class M(type):
             def __instancecheck__(self, obj):
                 called.append("called")
@@ -272,9 +272,30 @@
         except Special:
             pass
 
+    def test_exception_bad_subclasscheck(self):
+        """
+        import sys
+        class Meta(type):
+            def __subclasscheck__(cls, subclass):
+                raise ValueError()
+
+        class MyException(Exception, metaclass=Meta):
+            pass
+
+        try:
+            raise KeyError()
+        except MyException as e:
+            assert False, "exception should not be a MyException"
+        except KeyError:
+            pass
+        except:
+            assert False, "Should have raised KeyError"
+        else:
+            assert False, "Should have raised KeyError"
+        """
+
     def test_exception_contains_type_name(self):
         with raises(TypeError) as e:
             issubclass(type, None)
         print(e.value)
         assert "NoneType" in str(e.value)
-
diff --git a/pypy/module/_multibytecodec/c_codecs.py b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_codecs.py
+++ b/pypy/module/_multibytecodec/c_codecs.py
@@ -194,17 +194,23 @@
                                            rffi.SSIZE_T)
 pypy_cjk_enc_getcodec = llexternal('pypy_cjk_enc_getcodec',
                                    [ENCODEBUF_P], MULTIBYTECODEC_P)
+pypy_cjk_enc_copystate = llexternal('pypy_cjk_enc_copystate',
+                                    [ENCODEBUF_P, ENCODEBUF_P], lltype.Void)
 MBENC_FLUSH = 1
 MBENC_RESET = 2
 
 def encode(codec, unicodedata, length, errors="strict", errorcb=None,
-           namecb=None):
+           namecb=None, copystate=lltype.nullptr(ENCODEBUF_P.TO)):
     encodebuf = pypy_cjk_enc_new(codec)
     if not encodebuf:
         raise MemoryError
+    if copystate:
+        pypy_cjk_enc_copystate(encodebuf, copystate)
     try:
         return encodeex(encodebuf, unicodedata, length, errors, errorcb, namecb)
     finally:
+        if copystate:
+            pypy_cjk_enc_copystate(copystate, encodebuf)
         pypy_cjk_enc_free(encodebuf)
 
 def encodeex(encodebuf, utf8data, length, errors="strict", errorcb=None,
@@ -257,22 +263,21 @@
         raise EncodeDecodeError(start, end, reason)
     elif errors == "ignore":
         replace = ""
+        rettype = 'b'   # != 'u'
     elif errors == "replace":
-        codec = pypy_cjk_enc_getcodec(encodebuf)
-        try:
-            replace = encode(codec, "?", 1)
-        except EncodeDecodeError:
-            replace = "?"
+        replace = "?"    # utf-8 unicode
+        rettype = 'u'
     else:
         assert errorcb
         replace, end, rettype = errorcb(errors, namecb, reason,
                             unicodedata, start, end)
-        if rettype == 'u':
-            codec = pypy_cjk_enc_getcodec(encodebuf)
-            lgt = rutf8.check_utf8(replace, False)
-            replace = encode(codec, replace, lgt)
-    lgt = len(replace)
+    if rettype == 'u':
+        codec = pypy_cjk_enc_getcodec(encodebuf)
+        lgt = rutf8.check_utf8(replace, False)
+        replace = encode(codec, replace, lgt, copystate=encodebuf)
+    #else:
+    #   replace is meant to be a byte string already
     with rffi.scoped_nonmovingbuffer(replace) as inbuf:
-        r = pypy_cjk_enc_replace_on_error(encodebuf, inbuf, lgt, end)
+        r = pypy_cjk_enc_replace_on_error(encodebuf, inbuf, len(replace), end)
     if r == MBERR_NOMEMORY:
         raise MemoryError
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
@@ -135,6 +135,11 @@
   return d;
 }
 
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src)
+{
+    dst->state = src->state;
+}
+
 Py_ssize_t pypy_cjk_enc_init(struct pypy_cjk_enc_s *d,
                              Py_UNICODE *inbuf, Py_ssize_t inlen)
 {
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
--- a/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
+++ b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
@@ -146,6 +146,8 @@
                                       char *, pypymbc_ssize_t, pypymbc_ssize_t);
 RPY_EXTERN
 const MultibyteCodec *pypy_cjk_enc_getcodec(struct pypy_cjk_enc_s *);
+RPY_EXTERN
+void pypy_cjk_enc_copystate(struct pypy_cjk_enc_s *dst, struct pypy_cjk_enc_s *src);
 
 /* list of codecs defined in the .c files */
 
diff --git a/pypy/module/_multibytecodec/test/test_app_codecs.py b/pypy/module/_multibytecodec/test/test_app_codecs.py
--- a/pypy/module/_multibytecodec/test/test_app_codecs.py
+++ b/pypy/module/_multibytecodec/test/test_app_codecs.py
@@ -126,3 +126,33 @@
                               lambda e: (b'\xc3', e.end))
         result = "\uDDA1".encode("gbk", "test.test_encode_custom_error_handler_type")
         assert b'\xc3' in result
+
+    def test_encode_replacement_with_state(self):
+        import codecs
+        s = u'\u4ee4\u477c\u4ee4'.encode("iso-2022-jp", errors="replace")
+        assert s == b'\x1b$BNa\x1b(B?\x1b$BNa\x1b(B'
+
+    def test_streaming_codec(self):
+        test_0 = u'\uc5fc\u76d0\u5869\u9e7d\u477c\u4e3d/\u3012'
+        test_1 = u'\u4ee4\u477c\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b'
+        test_2 = u' foo = "Quoted string ****\u4ee4\u477c" '
+
+        ereplace = {'errors': 'replace'}
+        exml = {'errors': 'xmlcharrefreplace'}
+        for codec in ("iso-2022-jp", "iso-2022-jp-ext", "iso-2022-jp-1",
+                      "iso-2022-jp-2", "iso-2022-jp-3", "iso-2022-jp-2004",
+                      "iso-2022-kr",
+                     ):
+
+            out_1 = test_1.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_1.endswith(u'\u3080\u304b\u3057\u3080\u304b\u3057\u3042\u308b\u3068\u3053\u308d\u306b')
+
+            out_0a = test_0.encode(codec, **ereplace).decode(codec, **ereplace)
+            for n, char in enumerate(out_0a):
+                assert char in (test_0[n], "?")
+
+            out_0b = test_0.encode(codec, **exml).decode(codec, **ereplace)
+            assert "䝼" in out_0b
+
+            out_2 = test_2.encode(codec, **ereplace).decode(codec, **ereplace)
+            assert out_2.count('"') == 2
diff --git a/pypy/module/cpyext/codecs.py b/pypy/module/cpyext/codecs.py
--- a/pypy/module/cpyext/codecs.py
+++ b/pypy/module/cpyext/codecs.py
@@ -20,3 +20,12 @@
     else:
         return space.call_method(w_codec, "incrementaldecoder")
 
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Encoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(0))
+
+ at cpython_api([CONST_STRING], PyObject)
+def PyCodec_Decoder(space, encoding):
+    w_codec = interp_codecs.lookup_codec(space, rffi.charp2str(encoding))
+    return space.getitem(w_codec, space.newint(1))
diff --git a/pypy/module/cpyext/include/Python.h b/pypy/module/cpyext/include/Python.h
--- a/pypy/module/cpyext/include/Python.h
+++ b/pypy/module/cpyext/include/Python.h
@@ -123,6 +123,7 @@
 #include "sliceobject.h"
 #include "genobject.h"
 #include "datetime.h"
+#include "structseq.h"
 #include "pystate.h"
 #include "fileobject.h"
 #include "pysignals.h"
diff --git a/pypy/module/cpyext/test/test_codecs.py b/pypy/module/cpyext/test/test_codecs.py
--- a/pypy/module/cpyext/test/test_codecs.py
+++ b/pypy/module/cpyext/test/test_codecs.py
@@ -2,7 +2,8 @@
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from rpython.rtyper.lltypesystem import rffi
 from pypy.module.cpyext.codecs import (
-    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder)
+    PyCodec_IncrementalEncoder, PyCodec_IncrementalDecoder,
+    PyCodec_Encoder, PyCodec_Decoder)
 
 class TestCodecs(BaseApiTest):
     def test_incremental(self, space):
@@ -13,3 +14,13 @@
         w_decoded = space.call_method(w_decoder, 'decode', w_encoded)
         assert space.utf8_w(w_decoded) == u'späm'.encode("utf-8")
         rffi.free_charp(utf8)
+
+    def test_encoder_decoder(self, space):
+        utf8 = rffi.str2charp('utf-8')
+        w_encoder = PyCodec_Encoder(space, utf8)
+        w_decoder = PyCodec_Decoder(space, utf8)
+        rffi.free_charp(utf8)
+        space.appexec([w_encoder, w_decoder], r"""(encoder, decoder):
+            assert encoder(u"\u1234") == (b"\xe1\x88\xb4", 1)
+            assert decoder(b"\xe1\x88\xb4") == (u"\u1234", 3)
+        """)
diff --git a/pypy/tool/pytest/apptest.py b/pypy/tool/pytest/apptest.py
--- a/pypy/tool/pytest/apptest.py
+++ b/pypy/tool/pytest/apptest.py
@@ -35,6 +35,24 @@
     def __init__(self, excinfo):
         self.excinfo = excinfo
 
+class PythonInterpreter(object):
+    def __init__(self, path):
+        self.path = path
+        self._is_pypy = None
+
+    @property
+    def is_pypy(self):
+        if self._is_pypy is not None:
+            return self._is_pypy
+        CODE = "import sys; print('__pypy__' in sys.builtin_module_names)"
+        res, stdout, stderr = run_subprocess( self.path, ["-c", CODE])
+        if res != 0:
+            raise ValueError("Invalid Python interpreter")
+        print stdout
+        is_pypy = stdout.strip() == 'True'
+        self._is_pypy = is_pypy
+        return is_pypy
+
 
 def py3k_repr(value):
     "return the repr() that py3k would give for an object."""
@@ -120,7 +138,7 @@
                 pytest.fail("DID NOT RAISE")
             self.value = tp[1]
             return issubclass(tp[0], self.expected_exception)
-    
+
     __builtins__.raises = raises
     class Test:
         pass

From pypy.commits at gmail.com  Wed Jan 29 15:08:51 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 29 Jan 2020 12:08:51 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: fix merge
Message-ID: <5e31e653.1c69fb81.f72c7.474a@mx.google.com>

Author: Matti Picus 
Branch: py3.7
Changeset: r98595:af1982e722d3
Date: 2020-01-29 22:07 +0200
http://bitbucket.org/pypy/pypy/changeset/af1982e722d3/

Log:	fix merge

diff --git a/lib-python/3/venv/__init__.py b/lib-python/3/venv/__init__.py
--- a/lib-python/3/venv/__init__.py
+++ b/lib-python/3/venv/__init__.py
@@ -187,10 +187,10 @@
                     logger.warning('Unable to symlink %r to %r', src, dst)
                     force_copy = True
             if force_copy:
-            if os.path.isdir(src):
-                shutil.copytree(src, dst)
-            else:
-                shutil.copyfile(src, dst)
+                if os.path.isdir(src):
+                    shutil.copytree(src, dst)
+                else:
+                    shutil.copyfile(src, dst)
     else:
         def symlink_or_copy(self, src, dst, relative_symlinks_ok=False):
             """

From pypy.commits at gmail.com  Wed Jan 29 15:47:24 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Wed, 29 Jan 2020 12:47:24 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: way too much work: forbid "% %" % () and
 variants
Message-ID: <5e31ef5c.1c69fb81.74c60.5290@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98598:a512d2966a9a
Date: 2020-01-29 21:46 +0100
http://bitbucket.org/pypy/pypy/changeset/a512d2966a9a/

Log:	way too much work: forbid "% %" % () and variants

diff --git a/pypy/objspace/std/formatting.py b/pypy/objspace/std/formatting.py
--- a/pypy/objspace/std/formatting.py
+++ b/pypy/objspace/std/formatting.py
@@ -297,12 +297,20 @@
                 result.append_slice(fmt, i0, i)
                 self.fmtpos = i + 1
 
+                c = self.peekchr()
+                if c == '%':
+                    self.forward()
+                    self.result.append('%')
+                    continue
+
                 # interpret the next formatter
                 w_value = self.parse_fmt()
                 c = self.peekchr()
                 self.forward()
                 if c == '%':
-                    self.result.append('%')
+                    # if we get here there were extra characters between the
+                    # two %, forbidden now
+                    self.two_percent_error(i + 1)
                     continue
 
                 # first check whether it's a invalid char, *then* call
@@ -329,17 +337,29 @@
             self.checkconsumed()
             return result.build()
 
-        def unknown_fmtchar(self):
+        def _get_error_info(self, pos):
             space = self.space
             if do_unicode:
-                cp = rutf8.codepoint_at_pos(self.fmt, self.fmtpos - 1)
-                pos = rutf8.codepoints_in_utf8(self.fmt, 0, self.fmtpos - 1)
+                cp = rutf8.codepoint_at_pos(self.fmt, pos)
+                pos = rutf8.codepoints_in_utf8(self.fmt, 0, pos)
                 w_s = space.newutf8(rutf8.unichr_as_utf8(r_uint(cp),
                                                   allow_surrogates=True), 1)
             else:
-                cp = ord(self.fmt[self.fmtpos - 1])
-                pos = self.fmtpos - 1
+                cp = ord(self.fmt[pos])
                 w_s = space.newbytes(chr(cp))
+            return w_s, pos, cp
+
+        def two_percent_error(self, pos):
+            space = self.space
+            w_s, pos, cp = self._get_error_info(pos)
+            raise oefmt(space.w_ValueError,
+                        # hahahaha
+                        "extra character %R (%s) before escaped '%%' at index %d, use '%%%%'",
+                        w_s, hex(cp), pos)
+
+        def unknown_fmtchar(self):
+            space = self.space
+            w_s, pos, cp = self._get_error_info(self.fmtpos - 1)
             raise oefmt(space.w_ValueError,
                         "unsupported format character %R (%s) at index %d",
                         w_s, hex(cp), pos)
diff --git a/pypy/objspace/std/test/test_stringformat.py b/pypy/objspace/std/test/test_stringformat.py
--- a/pypy/objspace/std/test/test_stringformat.py
+++ b/pypy/objspace/std/test/test_stringformat.py
@@ -278,6 +278,11 @@
         with raises(ValueError):
             "%?" % {} # not TypeError
 
+    def test_no_chars_between_percent(self):
+        with raises(ValueError) as exc:
+            "%   %" % ()
+        assert "extra character ' ' (0x20) before escaped '%' at index 1" in str(exc.value)
+
 class AppTestWidthPrec:
     def test_width(self):
         a = 'a'

From pypy.commits at gmail.com  Wed Jan 29 16:01:29 2020
From: pypy.commits at gmail.com (mattip)
Date: Wed, 29 Jan 2020 13:01:29 -0800 (PST)
Subject: [pypy-commit] benchmarks default: update for cpython run via
 run_local.py
Message-ID: <5e31f2a9.1c69fb81.bcb2.25ce@mx.google.com>

Author: Matti Picus 
Branch: 
Changeset: r439:0a0be263be14
Date: 2020-01-29 23:01 +0200
http://bitbucket.org/pypy/benchmarks/changeset/0a0be263be14/

Log:	update for cpython run via run_local.py

diff --git a/benchmarks.py b/benchmarks.py
--- a/benchmarks.py
+++ b/benchmarks.py
@@ -25,7 +25,7 @@
 def _register_new_bm_twisted(name, bm_name, d, **opts):
     def Measure(python, options):
         def parser(line):
-            number = float(line.split(" ")[0])
+            number = float(line.split(b" ")[0])
             if name == 'tcp':
                 return 100*1024*1024/number
             elif name == 'iteration':
diff --git a/run_local.py b/run_local.py
--- a/run_local.py
+++ b/run_local.py
@@ -16,12 +16,12 @@
     --fast
     --args=ARGS         arguments to give to pypy-c, must not contain a comma!
 """
-
+from __future__ import print_function
 import sys, os
 import subprocess
 
 if len(sys.argv) < 2 or sys.argv[1].startswith('-'):
-    print __doc__
+    print(__doc__)
     sys.exit(2)
 
 pypy_c = sys.argv[1]
@@ -36,11 +36,11 @@
            '--changed', os.path.join(localdir, 'nullpython.py'),
            '--full-store',
            ] + sys.argv[1:]
-print
-print 'Executing', cmdline
-print
+print('')
+print('Executing', cmdline)
+print('')
 
 r = subprocess.call(cmdline)
 if r:
-    print >> sys.stderr, '*** exit code %r ***' % (r,)
+    print('*** exit code %r ***' % (r,), file=sys.stderr)
     sys.exit(r)
diff --git a/savecpython.py b/savecpython.py
--- a/savecpython.py
+++ b/savecpython.py
@@ -21,12 +21,20 @@
         res_type = b[1]
         results = b[2]
         value = 0
-        if res_type == "SimpleComparisonResult" or res_type == 'RawResult':
+        if res_type == "SimpleComparisonResult"
+            if base:
+                value = results['base_time']
+            else:
+                value = results['changed_time']
+            if value is None:
+                continue
+            value = value[0]
+        elif res_type == 'RawResult':
             if base:
                 value = results['base_times']
             else:
                 value = results['changed_times']
-            if value is None:
+            if value is None or len(value) == 0:
                 continue
             value = value[0]
         elif res_type == "ComparisonResult":
@@ -92,6 +100,6 @@
         print parser.usage
         sys.exit(1)
     results = json.load(open(args[1]))['results']
-    save('cpython', options.revision, results, None, 'cpython', 'tannit',
+    save('cpython', options.revision, results, None, 'cpython', 'benchmarker',
          testing=False,
          base=options.base)

From pypy.commits at gmail.com  Thu Jan 30 05:39:29 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 30 Jan 2020 02:39:29 -0800 (PST)
Subject: [pypy-commit] pypy default: add missing reverse operations to set
 and frozenset objects
Message-ID: <5e32b261.1c69fb81.b7a04.a9bc@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98599:67454ea967cb
Date: 2020-01-30 11:34 +0100
http://bitbucket.org/pypy/pypy/changeset/67454ea967cb/

Log:	add missing reverse operations to set and frozenset objects

diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -254,10 +254,16 @@
             return space.w_NotImplemented
         return self.difference(w_other)
 
+    def descr_rsub(self, space, w_other):
+        if not isinstance(w_other, W_BaseSetObject):
+            return space.w_NotImplemented
+        return w_other.difference(self)
+
     def descr_and(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
             return space.w_NotImplemented
         return self.intersect(w_other)
+    descr_rand = descr_and # symmetric
 
     def descr_or(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
@@ -265,11 +271,13 @@
         w_copy = self.copy_real()
         w_copy.update(w_other)
         return w_copy
+    descr_ror = descr_or # symmetric
 
     def descr_xor(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
             return space.w_NotImplemented
         return self.symmetric_difference(w_other)
+    descr_rxor = descr_xor # symmetric
 
     def descr_inplace_sub(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
@@ -541,9 +549,13 @@
     __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
     __contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
     __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
+    __rsub__ = gateway.interp2app(W_BaseSetObject.descr_rsub),
     __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
+    __rand__ = gateway.interp2app(W_BaseSetObject.descr_rand),
     __or__ = gateway.interp2app(W_BaseSetObject.descr_or),
+    __ror__ = gateway.interp2app(W_BaseSetObject.descr_ror),
     __xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
+    __rxor__ = gateway.interp2app(W_BaseSetObject.descr_rxor),
 
     # mutating operators
     __isub__ = gateway.interp2app(W_BaseSetObject.descr_inplace_sub),
@@ -663,9 +675,13 @@
     __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
     __contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
     __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
+    __rsub__ = gateway.interp2app(W_BaseSetObject.descr_rsub),
     __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
+    __rand__ = gateway.interp2app(W_BaseSetObject.descr_rand),
     __or__ = gateway.interp2app(W_BaseSetObject.descr_or),
+    __ror__ = gateway.interp2app(W_BaseSetObject.descr_ror),
     __xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
+    __rxor__ = gateway.interp2app(W_BaseSetObject.descr_rxor),
 
     # non-mutating methods
     __reduce__ = gateway.interp2app(W_BaseSetObject.descr_reduce),
diff --git a/pypy/objspace/std/test/test_setobject.py b/pypy/objspace/std/test/test_setobject.py
--- a/pypy/objspace/std/test/test_setobject.py
+++ b/pypy/objspace/std/test/test_setobject.py
@@ -610,6 +610,40 @@
             assert type(t) is subset
             assert not hasattr(t, 'x')
 
+    def test_reverse_ops(self):
+        assert set.__rxor__
+        assert frozenset.__rxor__
+        assert set.__ror__
+        assert frozenset.__ror__
+        assert set.__rand__
+        assert frozenset.__rand__
+        assert set.__rsub__
+        assert frozenset.__rsub__
+
+        # actual behaviour test
+        for base in [set, frozenset]:
+            class S(base):
+                def __xor__(self, other):
+                    if type(other) is not S:
+                        return NotImplemented
+                    return 1
+                __or__ = __and__ = __sub__ = __xor__
+            assert S([1, 2, 3]) ^ S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) ^ {2, 3, 4} == {1, 4}
+            assert {1, 2, 3} ^ S([2, 3, 4]) == {1, 4}
+
+            assert S([1, 2, 3]) & S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) & {2, 3, 4} == {2, 3}
+            assert {1, 2, 3} & S([2, 3, 4]) == {2, 3}
+
+            assert S([1, 2, 3]) | S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) | {2, 3, 4} == {1, 2, 3, 4}
+            assert {1, 2, 3} | S([2, 3, 4]) == {1, 2, 3, 4}
+
+            assert S([1, 2, 3]) - S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) - {2, 3, 4} == {1}
+            assert {1, 2, 3} - S([2, 3, 4]) == {1}
+
     def test_isdisjoint(self):
         assert set([1,2,3]).isdisjoint(set([4,5,6]))
         assert set([1,2,3]).isdisjoint(frozenset([4,5,6]))

From pypy.commits at gmail.com  Thu Jan 30 06:01:50 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Thu, 30 Jan 2020 03:01:50 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: merge default
Message-ID: <5e32b79e.1c69fb81.94c6.e79b@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98600:75200e919c58
Date: 2020-01-30 11:59 +0100
http://bitbucket.org/pypy/pypy/changeset/75200e919c58/

Log:	merge default

diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -247,10 +247,16 @@
             return space.w_NotImplemented
         return self.difference(w_other)
 
+    def descr_rsub(self, space, w_other):
+        if not isinstance(w_other, W_BaseSetObject):
+            return space.w_NotImplemented
+        return w_other.difference(self)
+
     def descr_and(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
             return space.w_NotImplemented
         return self.intersect(w_other)
+    descr_rand = descr_and # symmetric
 
     def descr_or(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
@@ -258,11 +264,13 @@
         w_copy = self.copy_real()
         w_copy.update(w_other)
         return w_copy
+    descr_ror = descr_or # symmetric
 
     def descr_xor(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
             return space.w_NotImplemented
         return self.symmetric_difference(w_other)
+    descr_rxor = descr_xor # symmetric
 
     def descr_inplace_sub(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
@@ -528,9 +536,13 @@
     __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
     __contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
     __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
+    __rsub__ = gateway.interp2app(W_BaseSetObject.descr_rsub),
     __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
+    __rand__ = gateway.interp2app(W_BaseSetObject.descr_rand),
     __or__ = gateway.interp2app(W_BaseSetObject.descr_or),
+    __ror__ = gateway.interp2app(W_BaseSetObject.descr_ror),
     __xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
+    __rxor__ = gateway.interp2app(W_BaseSetObject.descr_rxor),
 
     # mutating operators
     __isub__ = gateway.interp2app(W_BaseSetObject.descr_inplace_sub),
@@ -644,9 +656,13 @@
     __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
     __contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
     __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
+    __rsub__ = gateway.interp2app(W_BaseSetObject.descr_rsub),
     __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
+    __rand__ = gateway.interp2app(W_BaseSetObject.descr_rand),
     __or__ = gateway.interp2app(W_BaseSetObject.descr_or),
+    __ror__ = gateway.interp2app(W_BaseSetObject.descr_ror),
     __xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
+    __rxor__ = gateway.interp2app(W_BaseSetObject.descr_rxor),
 
     # non-mutating methods
     __reduce__ = gateway.interp2app(W_BaseSetObject.descr_reduce),
diff --git a/pypy/objspace/std/test/test_setobject.py b/pypy/objspace/std/test/test_setobject.py
--- a/pypy/objspace/std/test/test_setobject.py
+++ b/pypy/objspace/std/test/test_setobject.py
@@ -650,6 +650,40 @@
             assert type(t) is base
             assert not hasattr(t, 'x')
 
+    def test_reverse_ops(self):
+        assert set.__rxor__
+        assert frozenset.__rxor__
+        assert set.__ror__
+        assert frozenset.__ror__
+        assert set.__rand__
+        assert frozenset.__rand__
+        assert set.__rsub__
+        assert frozenset.__rsub__
+
+        # actual behaviour test
+        for base in [set, frozenset]:
+            class S(base):
+                def __xor__(self, other):
+                    if type(other) is not S:
+                        return NotImplemented
+                    return 1
+                __or__ = __and__ = __sub__ = __xor__
+            assert S([1, 2, 3]) ^ S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) ^ {2, 3, 4} == {1, 4}
+            assert {1, 2, 3} ^ S([2, 3, 4]) == {1, 4}
+
+            assert S([1, 2, 3]) & S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) & {2, 3, 4} == {2, 3}
+            assert {1, 2, 3} & S([2, 3, 4]) == {2, 3}
+
+            assert S([1, 2, 3]) | S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) | {2, 3, 4} == {1, 2, 3, 4}
+            assert {1, 2, 3} | S([2, 3, 4]) == {1, 2, 3, 4}
+
+            assert S([1, 2, 3]) - S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) - {2, 3, 4} == {1}
+            assert {1, 2, 3} - S([2, 3, 4]) == {1}
+
     def test_isdisjoint(self):
         assert set([1,2,3]).isdisjoint(set([4,5,6]))
         assert set([1,2,3]).isdisjoint(frozenset([4,5,6]))

From pypy.commits at gmail.com  Thu Jan 30 13:04:23 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 30 Jan 2020 10:04:23 -0800 (PST)
Subject: [pypy-commit] extradoc extradoc: Update
Message-ID: <5e331aa7.1c69fb81.c02aa.6333@mx.google.com>

Author: Armin Rigo 
Branch: extradoc
Changeset: r5985:85cb797d8a37
Date: 2020-01-30 19:04 +0100
http://bitbucket.org/pypy/extradoc/changeset/85cb797d8a37/

Log:	Update

diff --git a/sprintinfo/leysin-winter-2020/announcement.txt b/sprintinfo/leysin-winter-2020/announcement.txt
--- a/sprintinfo/leysin-winter-2020/announcement.txt
+++ b/sprintinfo/leysin-winter-2020/announcement.txt
@@ -1,5 +1,5 @@
 =====================================================================
-Leysin Winter sprint 2020: Feb 28 - March 7th
+Leysin Winter sprint 2020: Feb 29 - March 8th
 =====================================================================
 
 The next PyPy sprint will be in Leysin, Switzerland, for the fourteenth time.
@@ -23,15 +23,13 @@
 Times and accomodation
 ----------------------
 
-The sprint will occur for one week starting on Friday, the 28th of February, to
-Friday or Saturday, the 6th or 7th of March 2020.  It will occur in Les
+The sprint will occur for one week starting on Saturday, the 29th of
+February, to Sunday, the 8th of March 2020.  It will occur in Les
 Airelles, a different bed-and-breakfast place from the traditional one in
 Leysin.  It is a nice old house at the top of the village.
 
-We have a 4- or 5-people room as well as up to three double-rooms.  Please
-register early!  These rooms are not booked for the sprint in advance, and
-might be already taken if you end up announcing yourself late.  (But it is of
-course always possible to book at a different place in Leysin.)
+We have a booked room for up to 7 people (plus extra smaller rooms possible).
+(Of course it is always possible to book at a different place in Leysin.)
 
 You can register by adding your name in people.txt here.  For more information,
 write to me directly at armin.rigo at gmail.com.
diff --git a/sprintinfo/leysin-winter-2020/people.txt b/sprintinfo/leysin-winter-2020/people.txt
--- a/sprintinfo/leysin-winter-2020/people.txt
+++ b/sprintinfo/leysin-winter-2020/people.txt
@@ -15,3 +15,6 @@
 Manuel Jacob         Feb 29–Mar 8   Les Airelles
 Simon Cross          Feb 27-Mar 6   Les Airelles, bringing partner
 ==================== ============== =======================
+
+The big room is for up to 7 people, probably with some subdivisions.
+It is booked for the Feb 29 - March 8 period.

From pypy.commits at gmail.com  Fri Jan 31 00:21:40 2020
From: pypy.commits at gmail.com (arigo)
Date: Thu, 30 Jan 2020 21:21:40 -0800 (PST)
Subject: [pypy-commit] cffi default: The point of this example is that it
 doesn't work with a variable, only with a
Message-ID: <5e33b964.1c69fb81.1361c.dfbd@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r3332:459f86e1d944
Date: 2020-01-31 06:20 +0100
http://bitbucket.org/cffi/cffi/changeset/459f86e1d944/

Log:	The point of this example is that it doesn't work with a variable,
	only with a constant number. So don't use `n`.

diff --git a/doc/source/ref.rst b/doc/source/ref.rst
--- a/doc/source/ref.rst
+++ b/doc/source/ref.rst
@@ -37,7 +37,7 @@
 allocate an instance according to the specified C type and return a
 pointer to it.  The specified C type must be either a pointer or an
 array: ``new('X *')`` allocates an X and returns a pointer to it,
-whereas ``new('X[n]')`` allocates an array of n X'es and returns an
+whereas ``new('X[10]')`` allocates an array of 10 X'es and returns an
 array referencing it (which works mostly like a pointer, like in C).
 You can also use ``new('X[]', n)`` to allocate an array of a
 non-constant length n.  See the `detailed documentation`__ for other

From pypy.commits at gmail.com  Fri Jan 31 00:21:54 2020
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 30 Jan 2020 21:21:54 -0800 (PST)
Subject: [pypy-commit] pypy StringIO-perf: Store UnicodeIO data as a list of
 unichars instead of GC strings
Message-ID: <5e33b972.1c69fb81.1602b.c10c@mx.google.com>

Author: Ronan Lamy 
Branch: StringIO-perf
Changeset: r98603:b53569f5531d
Date: 2020-01-31 05:20 +0000
http://bitbucket.org/pypy/pypy/changeset/b53569f5531d/

Log:	Store UnicodeIO data as a list of unichars instead of GC strings

diff --git a/pypy/module/_io/interp_stringio.py b/pypy/module/_io/interp_stringio.py
--- a/pypy/module/_io/interp_stringio.py
+++ b/pypy/module/_io/interp_stringio.py
@@ -21,7 +21,7 @@
         if len(self.data) > newlength:
             self.data = self.data[:newlength]
         if len(self.data) < newlength:
-            self.data.extend(['\0'] * (newlength - len(self.data)))
+            self.data.extend([u'\0'] * (newlength - len(self.data)))
 
     def read(self, size):
         start = self.pos
@@ -34,7 +34,7 @@
             end = len(self.data)
         assert 0 <= start <= end
         self.pos = end
-        return ''.join(self.data[start:end])
+        return u''.join(self.data[start:end]).encode('utf-8')
 
     def _convert_limit(self, limit):
         if limit < 0 or limit > len(self.data) - self.pos:
@@ -51,18 +51,18 @@
         while pos < end:
             ch = self.data[pos]
             pos += 1
-            if ch == '\n':
+            if ch == u'\n':
                 break
-            if ch == '\r':
+            if ch == u'\r':
                 if pos >= end:
                     break
-                if self.data[pos] == '\n':
+                if self.data[pos] == u'\n':
                     pos += 1
                     break
                 else:
                     break
         self.pos = pos
-        result = ''.join(self.data[start:pos])
+        result = u''.join(self.data[start:pos]).encode('utf-8')
         return result
 
     def readline(self, marker, limit):
@@ -70,6 +70,7 @@
         limit = self._convert_limit(limit)
         end = start + limit
         found = False
+        marker = marker.decode('utf-8')
         for pos in range(start, end - len(marker) + 1):
             ch = self.data[pos]
             if ch == marker[0]:
@@ -83,19 +84,17 @@
         if not found:
             pos = end
         self.pos = pos
-        result = ''.join(self.data[start:pos])
+        result = u''.join(self.data[start:pos]).encode('utf-8')
         return result
 
     def write(self, string):
-        length = codepoints_in_utf8(string)
-        if self.pos + length > len(self.data):
-            self.resize(self.pos + length)
-        pos = 0
-        for i in range(length):
-            nextpos = next_codepoint_pos(string, pos)
-            self.data[self.pos + i] = string[pos:nextpos]
-            pos = nextpos
-        self.pos += length
+        ustr = string.decode('utf-8')
+        newlen = self.pos + len(ustr)
+        if newlen > len(self.data):
+            self.resize(newlen)
+        for i in range(len(ustr)):
+            self.data[self.pos + i] = ustr[i]
+        self.pos += len(ustr)
 
     def seek(self, pos):
         self.pos = pos
@@ -105,7 +104,7 @@
             self.resize(size)
 
     def getvalue(self):
-        return ''.join(self.data)
+        return u''.join(self.data).encode('utf-8')
 
 
 class W_StringIO(W_TextIOBase):

From pypy.commits at gmail.com  Fri Jan 31 08:11:56 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:11:56 -0800 (PST)
Subject: [pypy-commit] pypy default: argh,
 fix bug in locale-specific string formatting: the thousands
 separator was always '.' :-(
Message-ID: <5e34279c.1c69fb81.95024.84e3@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98604:b6af70ef2dfb
Date: 2020-01-30 14:44 +0100
http://bitbucket.org/pypy/pypy/changeset/b6af70ef2dfb/

Log:	argh, fix bug in locale-specific string formatting: the thousands
	separator was always '.' :-(

diff --git a/pypy/objspace/std/newformat.py b/pypy/objspace/std/newformat.py
--- a/pypy/objspace/std/newformat.py
+++ b/pypy/objspace/std/newformat.py
@@ -772,7 +772,7 @@
                     digits = self._upcase_string(digits)
                 out.append(digits)
             if spec.n_decimal:
-                out.append(self._lit(".")[0])
+                out.append(self._lit(self._loc_dec)[0])
             if spec.n_remainder:
                 out.append(num[to_remainder:])
             if spec.n_rpadding:
diff --git a/pypy/objspace/std/test/test_newformat.py b/pypy/objspace/std/test/test_newformat.py
--- a/pypy/objspace/std/test/test_newformat.py
+++ b/pypy/objspace/std/test/test_newformat.py
@@ -389,6 +389,24 @@
         finally:
             locale.setlocale(locale.LC_NUMERIC, 'C')
 
+    def test_locale_german(self):
+        import locale
+        for name in ['de_DE', 'de_DE.utf8']:
+            try:
+                locale.setlocale(locale.LC_NUMERIC, name)
+                break
+            except locale.Error:
+                pass
+        else:
+            skip("no german locale")
+        x = 1234.567890
+        try:
+            assert locale.format('%g', x, grouping=True) == '1.234,57'
+            assert format(x, 'n') == '1.234,57'
+            assert format(12345678901234, 'n') == '12.345.678.901.234'
+        finally:
+            locale.setlocale(locale.LC_NUMERIC, 'C')
+
     def test_dont_switch_to_g(self):
         skip("must fix when float formatting is figured out")
         assert len(format(1.1234e90, "f")) == 98

From pypy.commits at gmail.com  Fri Jan 31 08:11:59 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:11:59 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: merge default
Message-ID: <5e34279f.1c69fb81.51edf.1345@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98605:0115587c02f4
Date: 2020-01-30 14:45 +0100
http://bitbucket.org/pypy/pypy/changeset/0115587c02f4/

Log:	merge default

diff --git a/pypy/objspace/std/newformat.py b/pypy/objspace/std/newformat.py
--- a/pypy/objspace/std/newformat.py
+++ b/pypy/objspace/std/newformat.py
@@ -802,7 +802,7 @@
                     digits = self._upcase_string(digits)
                 out.append(digits)
             if spec.n_decimal:
-                out.append(self._lit(".")[0])
+                out.append(self._lit(self._loc_dec)[0])
             if spec.n_remainder:
                 out.append(num[to_remainder:])
             if spec.n_rpadding:
diff --git a/pypy/objspace/std/test/test_newformat.py b/pypy/objspace/std/test/test_newformat.py
--- a/pypy/objspace/std/test/test_newformat.py
+++ b/pypy/objspace/std/test/test_newformat.py
@@ -404,6 +404,24 @@
         finally:
             locale.setlocale(locale.LC_NUMERIC, 'C')
 
+    def test_locale_german(self):
+        import locale
+        for name in ['de_DE', 'de_DE.utf8']:
+            try:
+                locale.setlocale(locale.LC_NUMERIC, name)
+                break
+            except locale.Error:
+                pass
+        else:
+            skip("no german locale")
+        x = 1234.567890
+        try:
+            assert locale.format('%g', x, grouping=True) == '1.234,57'
+            assert format(x, 'n') == '1.234,57'
+            assert format(12345678901234, 'n') == '12.345.678.901.234'
+        finally:
+            locale.setlocale(locale.LC_NUMERIC, 'C')
+
     def test_dont_switch_to_g(self):
         skip("must fix when float formatting is figured out")
         assert len(format(1.1234e90, "f")) == 98

From pypy.commits at gmail.com  Fri Jan 31 08:12:02 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:12:02 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.6
Message-ID: <5e3427a2.1c69fb81.da928.677d@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98606:c5c4cd76ef44
Date: 2020-01-30 14:45 +0100
http://bitbucket.org/pypy/pypy/changeset/c5c4cd76ef44/

Log:	merge py3.6

diff --git a/pypy/objspace/std/newformat.py b/pypy/objspace/std/newformat.py
--- a/pypy/objspace/std/newformat.py
+++ b/pypy/objspace/std/newformat.py
@@ -802,7 +802,7 @@
                     digits = self._upcase_string(digits)
                 out.append(digits)
             if spec.n_decimal:
-                out.append(self._lit(".")[0])
+                out.append(self._lit(self._loc_dec)[0])
             if spec.n_remainder:
                 out.append(num[to_remainder:])
             if spec.n_rpadding:
diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py
--- a/pypy/objspace/std/setobject.py
+++ b/pypy/objspace/std/setobject.py
@@ -247,10 +247,16 @@
             return space.w_NotImplemented
         return self.difference(w_other)
 
+    def descr_rsub(self, space, w_other):
+        if not isinstance(w_other, W_BaseSetObject):
+            return space.w_NotImplemented
+        return w_other.difference(self)
+
     def descr_and(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
             return space.w_NotImplemented
         return self.intersect(w_other)
+    descr_rand = descr_and # symmetric
 
     def descr_or(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
@@ -258,11 +264,13 @@
         w_copy = self.copy_real()
         w_copy.update(w_other)
         return w_copy
+    descr_ror = descr_or # symmetric
 
     def descr_xor(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
             return space.w_NotImplemented
         return self.symmetric_difference(w_other)
+    descr_rxor = descr_xor # symmetric
 
     def descr_inplace_sub(self, space, w_other):
         if not isinstance(w_other, W_BaseSetObject):
@@ -528,9 +536,13 @@
     __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
     __contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
     __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
+    __rsub__ = gateway.interp2app(W_BaseSetObject.descr_rsub),
     __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
+    __rand__ = gateway.interp2app(W_BaseSetObject.descr_rand),
     __or__ = gateway.interp2app(W_BaseSetObject.descr_or),
+    __ror__ = gateway.interp2app(W_BaseSetObject.descr_ror),
     __xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
+    __rxor__ = gateway.interp2app(W_BaseSetObject.descr_rxor),
 
     # mutating operators
     __isub__ = gateway.interp2app(W_BaseSetObject.descr_inplace_sub),
@@ -644,9 +656,13 @@
     __iter__ = gateway.interp2app(W_BaseSetObject.descr_iter),
     __contains__ = gateway.interp2app(W_BaseSetObject.descr_contains),
     __sub__ = gateway.interp2app(W_BaseSetObject.descr_sub),
+    __rsub__ = gateway.interp2app(W_BaseSetObject.descr_rsub),
     __and__ = gateway.interp2app(W_BaseSetObject.descr_and),
+    __rand__ = gateway.interp2app(W_BaseSetObject.descr_rand),
     __or__ = gateway.interp2app(W_BaseSetObject.descr_or),
+    __ror__ = gateway.interp2app(W_BaseSetObject.descr_ror),
     __xor__ = gateway.interp2app(W_BaseSetObject.descr_xor),
+    __rxor__ = gateway.interp2app(W_BaseSetObject.descr_rxor),
 
     # non-mutating methods
     __reduce__ = gateway.interp2app(W_BaseSetObject.descr_reduce),
diff --git a/pypy/objspace/std/test/test_newformat.py b/pypy/objspace/std/test/test_newformat.py
--- a/pypy/objspace/std/test/test_newformat.py
+++ b/pypy/objspace/std/test/test_newformat.py
@@ -404,6 +404,24 @@
         finally:
             locale.setlocale(locale.LC_NUMERIC, 'C')
 
+    def test_locale_german(self):
+        import locale
+        for name in ['de_DE', 'de_DE.utf8']:
+            try:
+                locale.setlocale(locale.LC_NUMERIC, name)
+                break
+            except locale.Error:
+                pass
+        else:
+            skip("no german locale")
+        x = 1234.567890
+        try:
+            assert locale.format('%g', x, grouping=True) == '1.234,57'
+            assert format(x, 'n') == '1.234,57'
+            assert format(12345678901234, 'n') == '12.345.678.901.234'
+        finally:
+            locale.setlocale(locale.LC_NUMERIC, 'C')
+
     def test_dont_switch_to_g(self):
         skip("must fix when float formatting is figured out")
         assert len(format(1.1234e90, "f")) == 98
diff --git a/pypy/objspace/std/test/test_setobject.py b/pypy/objspace/std/test/test_setobject.py
--- a/pypy/objspace/std/test/test_setobject.py
+++ b/pypy/objspace/std/test/test_setobject.py
@@ -650,6 +650,40 @@
             assert type(t) is base
             assert not hasattr(t, 'x')
 
+    def test_reverse_ops(self):
+        assert set.__rxor__
+        assert frozenset.__rxor__
+        assert set.__ror__
+        assert frozenset.__ror__
+        assert set.__rand__
+        assert frozenset.__rand__
+        assert set.__rsub__
+        assert frozenset.__rsub__
+
+        # actual behaviour test
+        for base in [set, frozenset]:
+            class S(base):
+                def __xor__(self, other):
+                    if type(other) is not S:
+                        return NotImplemented
+                    return 1
+                __or__ = __and__ = __sub__ = __xor__
+            assert S([1, 2, 3]) ^ S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) ^ {2, 3, 4} == {1, 4}
+            assert {1, 2, 3} ^ S([2, 3, 4]) == {1, 4}
+
+            assert S([1, 2, 3]) & S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) & {2, 3, 4} == {2, 3}
+            assert {1, 2, 3} & S([2, 3, 4]) == {2, 3}
+
+            assert S([1, 2, 3]) | S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) | {2, 3, 4} == {1, 2, 3, 4}
+            assert {1, 2, 3} | S([2, 3, 4]) == {1, 2, 3, 4}
+
+            assert S([1, 2, 3]) - S([2, 3, 4]) == 1
+            assert S([1, 2, 3]) - {2, 3, 4} == {1}
+            assert {1, 2, 3} - S([2, 3, 4]) == {1}
+
     def test_isdisjoint(self):
         assert set([1,2,3]).isdisjoint(set([4,5,6]))
         assert set([1,2,3]).isdisjoint(frozenset([4,5,6]))

From pypy.commits at gmail.com  Fri Jan 31 08:12:05 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:12:05 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: make get/set_coroutine_wrapper emit a
 DeprecationWarning
Message-ID: <5e3427a5.1c69fb81.89256.004f@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98607:66293dfd6fd3
Date: 2020-01-30 15:41 +0100
http://bitbucket.org/pypy/pypy/changeset/66293dfd6fd3/

Log:	make get/set_coroutine_wrapper emit a DeprecationWarning

diff --git a/pypy/interpreter/test/apptest_coroutine.py b/pypy/interpreter/test/apptest_coroutine.py
--- a/pypy/interpreter/test/apptest_coroutine.py
+++ b/pypy/interpreter/test/apptest_coroutine.py
@@ -123,6 +123,18 @@
     sys.set_coroutine_wrapper(None)
     assert sys.get_coroutine_wrapper() is None
 
+def test_get_set_coroutine_wrapper_deprecated():
+    import warnings
+    def my_wrapper(cr):
+        return 1
+    with warnings.catch_warnings(record=True) as l:
+        warnings.simplefilter('always', category=DeprecationWarning)
+        sys.get_coroutine_wrapper()
+        sys.set_coroutine_wrapper(my_wrapper)
+        sys.set_coroutine_wrapper(None)
+    print(l)
+    assert len(l) == 3
+
 def test_async_with():
     seen = []
     class X:
diff --git a/pypy/module/sys/vm.py b/pypy/module/sys/vm.py
--- a/pypy/module/sys/vm.py
+++ b/pypy/module/sys/vm.py
@@ -343,12 +343,14 @@
 
 def get_coroutine_wrapper(space):
     "Return the wrapper for coroutine objects set by sys.set_coroutine_wrapper."
+    space.warn(space.newtext("get_coroutine_wrapper is deprecated"), space.w_DeprecationWarning)
     ec = space.getexecutioncontext()
     if ec.w_coroutine_wrapper_fn is None:
         return space.w_None
     return ec.w_coroutine_wrapper_fn
 
 def set_coroutine_wrapper(space, w_wrapper):
+    space.warn(space.newtext("set_coroutine_wrapper is deprecated"), space.w_DeprecationWarning)
     "Set a wrapper for coroutine objects."
     ec = space.getexecutioncontext()
     if space.is_w(w_wrapper, space.w_None):

From pypy.commits at gmail.com  Fri Jan 31 08:12:08 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:12:08 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: only async *generator* expressions should
 work, not other comprehensions!
Message-ID: <5e3427a8.1c69fb81.4bd6c.7cdd@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98608:30f0db9aea2b
Date: 2020-01-30 16:00 +0100
http://bitbucket.org/pypy/pypy/changeset/30f0db9aea2b/

Log:	only async *generator* expressions should work, not other
	comprehensions!

diff --git a/pypy/interpreter/astcompiler/codegen.py b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -1567,7 +1567,11 @@
     def _compile_comprehension(self, node, name, sub_scope):
         is_async_function = self.scope.is_coroutine
         code, qualname = self.sub_scope(sub_scope, name, node, node.lineno)
-        is_async_generator = self.symbols.find_scope(node).is_coroutine
+        is_async_comprehension = self.symbols.find_scope(node).is_coroutine
+        if is_async_comprehension and not is_async_function:
+            if not isinstance(node, ast.GeneratorExp):
+                self.error("asynchronous comprehension outside of "
+                           "an asynchronous function", node)
 
         self.update_position(node.lineno)
         self._make_function(code, qualname=qualname)
@@ -1581,7 +1585,7 @@
         else:
             self.emit_op(ops.GET_ITER)
         self.emit_op_arg(ops.CALL_FUNCTION, 1)
-        if is_async_generator and sub_scope is not GenExpCodeGenerator:
+        if is_async_comprehension and sub_scope is not GenExpCodeGenerator:
             self.emit_op(ops.GET_AWAITABLE)
             self.load_const(self.space.w_None)
             self.emit_op(ops.YIELD_FROM)
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1231,6 +1231,33 @@
         """
         e = py.test.raises(SyntaxError, self.simple_test, source, "None", None)
 
+    def test_async_in_nested(self):
+        source = """if 1:
+        async def foo():
+            def bar():
+                [i async for i in items]
+        """
+        e = py.test.raises(SyntaxError, self.simple_test, source, "None", None)
+        source = """if 1:
+        async def foo():
+            def bar():
+                {i async for i in items}
+        """
+        e = py.test.raises(SyntaxError, self.simple_test, source, "None", None)
+        source = """if 1:
+        async def foo():
+            def bar():
+                {i: i+1 async for i in items}
+        """
+        e = py.test.raises(SyntaxError, self.simple_test, source, "None", None)
+        source = """if 1:
+        async def foo():
+            def bar():
+                (i async for i in items)
+        """
+        # ok!
+        self.simple_test(source, "None", None)
+
     def test_load_classderef(self):
         source = """if 1:
         def f():

From pypy.commits at gmail.com  Fri Jan 31 08:12:10 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:12:10 -0800 (PST)
Subject: [pypy-commit] pypy default: issue #3065 strikes again! fix segfault
 in mmap
Message-ID: <5e3427aa.1c69fb81.e5132.c347@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98609:d22a7659ed80
Date: 2020-01-31 14:04 +0100
http://bitbucket.org/pypy/pypy/changeset/d22a7659ed80/

Log:	issue #3065 strikes again! fix segfault in mmap

diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -177,8 +177,10 @@
             return space.newbytes(self.mmap.getslice(start, length))
         else:
             b = StringBuilder(length)
-            for i in range(start, stop, step):
-                b.append(self.mmap.getitem(i))
+            index = start
+            for i in range(length):
+                b.append(self.mmap.getitem(index))
+                index += step
             return space.newbytes(b.build())
 
     def descr_setitem(self, w_index, w_value):
diff --git a/pypy/module/mmap/test/test_mmap.py b/pypy/module/mmap/test/test_mmap.py
--- a/pypy/module/mmap/test/test_mmap.py
+++ b/pypy/module/mmap/test/test_mmap.py
@@ -433,6 +433,15 @@
         m.close()
         f.close()
 
+    def test_get_crash(self):
+        import sys
+        from mmap import mmap
+        s = b'hallo!!!'
+        m = mmap(-1, len(s))
+        m[:] = s
+        assert m[1:None:sys.maxsize] == b'a'
+        m.close()
+
     def test_set_item(self):
         import mmap
 

From pypy.commits at gmail.com  Fri Jan 31 08:12:13 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:12:13 -0800 (PST)
Subject: [pypy-commit] pypy py3.6: merge default
Message-ID: <5e3427ad.1c69fb81.771d8.43c7@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.6
Changeset: r98610:f0843db5a3a6
Date: 2020-01-31 14:06 +0100
http://bitbucket.org/pypy/pypy/changeset/f0843db5a3a6/

Log:	merge default

diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -190,8 +190,10 @@
             return space.newbytes(self.mmap.getslice(start, length))
         else:
             b = StringBuilder(length)
-            for i in range(start, stop, step):
-                b.append(self.mmap.getitem(i))
+            index = start
+            for i in range(length):
+                b.append(self.mmap.getitem(index))
+                index += step
             return space.newbytes(b.build())
 
     def descr_setitem(self, w_index, w_value):
diff --git a/pypy/module/mmap/test/test_mmap.py b/pypy/module/mmap/test/test_mmap.py
--- a/pypy/module/mmap/test/test_mmap.py
+++ b/pypy/module/mmap/test/test_mmap.py
@@ -431,6 +431,15 @@
         m.close()
         f.close()
 
+    def test_get_crash(self):
+        import sys
+        from mmap import mmap
+        s = b'hallo!!!'
+        m = mmap(-1, len(s))
+        m[:] = s
+        assert m[1:None:sys.maxsize] == b'a'
+        m.close()
+
     def test_set_item(self):
         import mmap
 

From pypy.commits at gmail.com  Fri Jan 31 08:12:15 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:12:15 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: merge py3.6
Message-ID: <5e3427af.1c69fb81.196fd.62c2@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98611:d024eab5de59
Date: 2020-01-31 14:07 +0100
http://bitbucket.org/pypy/pypy/changeset/d024eab5de59/

Log:	merge py3.6

diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -190,8 +190,10 @@
             return space.newbytes(self.mmap.getslice(start, length))
         else:
             b = StringBuilder(length)
-            for i in range(start, stop, step):
-                b.append(self.mmap.getitem(i))
+            index = start
+            for i in range(length):
+                b.append(self.mmap.getitem(index))
+                index += step
             return space.newbytes(b.build())
 
     def descr_setitem(self, w_index, w_value):
diff --git a/pypy/module/mmap/test/test_mmap.py b/pypy/module/mmap/test/test_mmap.py
--- a/pypy/module/mmap/test/test_mmap.py
+++ b/pypy/module/mmap/test/test_mmap.py
@@ -431,6 +431,15 @@
         m.close()
         f.close()
 
+    def test_get_crash(self):
+        import sys
+        from mmap import mmap
+        s = b'hallo!!!'
+        m = mmap(-1, len(s))
+        m[:] = s
+        assert m[1:None:sys.maxsize] == b'a'
+        m.close()
+
     def test_set_item(self):
         import mmap
 

From pypy.commits at gmail.com  Fri Jan 31 08:12:18 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 05:12:18 -0800 (PST)
Subject: [pypy-commit] pypy default: merge heads
Message-ID: <5e3427b2.1c69fb81.7a90e.0c4b@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: 
Changeset: r98612:39bcfae01bee
Date: 2020-01-31 14:10 +0100
http://bitbucket.org/pypy/pypy/changeset/39bcfae01bee/

Log:	merge heads

diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
+++ b/pypy/module/mmap/interp_mmap.py
@@ -177,8 +177,10 @@
             return space.newbytes(self.mmap.getslice(start, length))
         else:
             b = StringBuilder(length)
-            for i in range(start, stop, step):
-                b.append(self.mmap.getitem(i))
+            index = start
+            for i in range(length):
+                b.append(self.mmap.getitem(index))
+                index += step
             return space.newbytes(b.build())
 
     def descr_setitem(self, w_index, w_value):
diff --git a/pypy/module/mmap/test/test_mmap.py b/pypy/module/mmap/test/test_mmap.py
--- a/pypy/module/mmap/test/test_mmap.py
+++ b/pypy/module/mmap/test/test_mmap.py
@@ -433,6 +433,15 @@
         m.close()
         f.close()
 
+    def test_get_crash(self):
+        import sys
+        from mmap import mmap
+        s = b'hallo!!!'
+        m = mmap(-1, len(s))
+        m[:] = s
+        assert m[1:None:sys.maxsize] == b'a'
+        m.close()
+
     def test_set_item(self):
         import mmap
 
diff --git a/pypy/objspace/std/newformat.py b/pypy/objspace/std/newformat.py
--- a/pypy/objspace/std/newformat.py
+++ b/pypy/objspace/std/newformat.py
@@ -772,7 +772,7 @@
                     digits = self._upcase_string(digits)
                 out.append(digits)
             if spec.n_decimal:
-                out.append(self._lit(".")[0])
+                out.append(self._lit(self._loc_dec)[0])
             if spec.n_remainder:
                 out.append(num[to_remainder:])
             if spec.n_rpadding:
diff --git a/pypy/objspace/std/test/test_newformat.py b/pypy/objspace/std/test/test_newformat.py
--- a/pypy/objspace/std/test/test_newformat.py
+++ b/pypy/objspace/std/test/test_newformat.py
@@ -389,6 +389,24 @@
         finally:
             locale.setlocale(locale.LC_NUMERIC, 'C')
 
+    def test_locale_german(self):
+        import locale
+        for name in ['de_DE', 'de_DE.utf8']:
+            try:
+                locale.setlocale(locale.LC_NUMERIC, name)
+                break
+            except locale.Error:
+                pass
+        else:
+            skip("no german locale")
+        x = 1234.567890
+        try:
+            assert locale.format('%g', x, grouping=True) == '1.234,57'
+            assert format(x, 'n') == '1.234,57'
+            assert format(12345678901234, 'n') == '12.345.678.901.234'
+        finally:
+            locale.setlocale(locale.LC_NUMERIC, 'C')
+
     def test_dont_switch_to_g(self):
         skip("must fix when float formatting is figured out")
         assert len(format(1.1234e90, "f")) == 98

From pypy.commits at gmail.com  Fri Jan 31 09:48:02 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 06:48:02 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: generator_stop is not the default
Message-ID: <5e343e22.1c69fb81.cb39e.31cd@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98613:cac6a157cae7
Date: 2020-01-31 15:37 +0100
http://bitbucket.org/pypy/pypy/changeset/cac6a157cae7/

Log:	generator_stop is not the default

diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -163,23 +163,14 @@
         self.frame.w_yielding_from = w_delegate
 
     def _leak_stopiteration(self, e):
-        # Check for __future__ generator_stop and conditionally turn
-        # a leaking StopIteration into RuntimeError (with its cause
-        # set appropriately).
+        # turn a leaking StopIteration into RuntimeError (with its cause set
+        # appropriately).
         space = self.space
-        if self.pycode.co_flags & (consts.CO_FUTURE_GENERATOR_STOP |
-                                   consts.CO_COROUTINE |
-                                   consts.CO_ITERABLE_COROUTINE |
-                                   consts.CO_ASYNC_GENERATOR):
-            e2 = OperationError(space.w_RuntimeError,
-                                space.newtext("%s raised StopIteration" %
-                                              self.KIND))
-            e2.chain_exceptions_from_cause(space, e)
-            raise e2
-        else:
-            space.warn(space.newtext("generator '%s' raised StopIteration"
-                                        % self.get_qualname()),
-                       space.w_DeprecationWarning)
+        e2 = OperationError(space.w_RuntimeError,
+                            space.newtext("%s raised StopIteration" %
+                                          self.KIND))
+        e2.chain_exceptions_from_cause(space, e)
+        raise e2
 
     def _leak_stopasynciteration(self, e):
         space = self.space
diff --git a/pypy/interpreter/test/apptest_generator.py b/pypy/interpreter/test/apptest_generator.py
--- a/pypy/interpreter/test/apptest_generator.py
+++ b/pypy/interpreter/test/apptest_generator.py
@@ -221,16 +221,6 @@
     g = f()
     assert g.close() is None
 
-def test_close2():
-    def f():
-        try:
-            yield 1
-        except GeneratorExit:
-            raise StopIteration
-    g = f()
-    next(g)
-    assert g.close() is None
-
 def test_close3():
     def f():
         try:
@@ -275,21 +265,6 @@
     with raises(TypeError):
         g.send(1)  # not started, must send None
 
-def test_generator_explicit_stopiteration():
-    def f():
-        yield 1
-        raise StopIteration
-    g = f()
-    assert [x for x in g] == [1]
-
-def test_generator_propagate_stopiteration():
-    def f():
-        it = iter([1])
-        while 1:
-            yield next(it)
-    g = f()
-    assert [x for x in g] == [1]
-
 def test_generator_restart():
     def g():
         i = next(me)
@@ -325,12 +300,6 @@
     assert set(g) == set()
     assert set(i for i in range(0)) == set()
 
-def test_explicit_stop_iteration_unpackiterable():
-    def f():
-        yield 1
-        raise StopIteration
-    assert tuple(f()) == (1,)
-
 def test_exception_is_cleared_by_yield():
     def f():
         try:
@@ -826,34 +795,18 @@
     assert isinstance(excinfo.value.__context__, ValueError)
 
 
-def test_past_generator_stop():
-    # how it works without 'from __future__' import generator_stop
-    def f(x):
-        raise StopIteration
+def test_stopiteration_turned_into_runtime_error():
+    def badgenerator(x):
+        if x == 5:
+            raise StopIteration
         yield x
-    with raises(StopIteration):
-        next(f(5))
-
-def test_future_generator_stop():
-    d = {}
-    exec("""from __future__ import generator_stop
-
-def f(x):
-    raise StopIteration
-    yield x
-""", d)
-    f = d['f']
     with raises(RuntimeError):
-        next(f(5))
+        next(badgenerator(5))
 
 def test_generator_stop_cause():
-    d = {}
-    exec("""from __future__ import generator_stop
-
-def gen1():
-    yield 42
-""", d)
-    my_gen = d['gen1']()
+    def gen1():
+        yield 42
+    my_gen = gen1()
     assert next(my_gen) == 42
     stop_exc = StopIteration('spam')
     with raises(RuntimeError) as e:

From pypy.commits at gmail.com  Fri Jan 31 09:48:04 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 06:48:04 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: kill dead attributes
Message-ID: <5e343e24.1c69fb81.e756c.960b@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98614:784f171f4094
Date: 2020-01-31 15:38 +0100
http://bitbucket.org/pypy/pypy/changeset/784f171f4094/

Log:	kill dead attributes

diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -301,7 +301,6 @@
 class GeneratorIterator(GeneratorOrCoroutine):
     "An iterator created by a generator."
     KIND = "generator"
-    KIND_U = u"generator"
 
     def descr__iter__(self):
         """Implement iter(self)."""
@@ -348,7 +347,6 @@
 class Coroutine(GeneratorOrCoroutine):
     "A coroutine object."
     KIND = "coroutine"
-    KIND_U = u"coroutine"
 
     def descr__await__(self, space):
         return CoroutineWrapper(self)
@@ -502,7 +500,6 @@
 class AsyncGenerator(GeneratorOrCoroutine):
     "An async generator (i.e. a coroutine with a 'yield')"
     KIND = "async generator"
-    KIND_U = u"async_generator"
 
     def __init__(self, frame, name=None, qualname=None):
         self.hooks_inited = False

From pypy.commits at gmail.com  Fri Jan 31 14:34:00 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 11:34:00 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: implement coroutine origin tracking
Message-ID: <5e348128.1c69fb81.98577.4d2b@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98615:5c1dc1c61dcc
Date: 2020-01-31 20:28 +0100
http://bitbucket.org/pypy/pypy/changeset/5c1dc1c61dcc/

Log:	implement coroutine origin tracking

diff --git a/pypy/interpreter/executioncontext.py b/pypy/interpreter/executioncontext.py
--- a/pypy/interpreter/executioncontext.py
+++ b/pypy/interpreter/executioncontext.py
@@ -45,6 +45,7 @@
         self.w_asyncgen_firstiter_fn = None
         self.w_asyncgen_finalizer_fn = None
         self.contextvar_context = None
+        self.coroutine_origin_tracking_depth = 0
 
     @staticmethod
     def _mark_thread_disappeared(space):
diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -348,17 +348,42 @@
     "A coroutine object."
     KIND = "coroutine"
 
+    def __init__(self, frame, name=None, qualname=None):
+        GeneratorOrCoroutine.__init__(self, frame, name, qualname)
+        self.w_cr_origin = self.space.w_None
+
+    def capture_origin(self, ec):
+        if not ec.coroutine_origin_tracking_depth:
+            return
+        self._capture_origin(ec)
+
+    def _capture_origin(self, ec):
+        space = self.space
+        frames_w = []
+        frame = ec.gettopframe_nohidden()
+        for i in range(ec.coroutine_origin_tracking_depth):
+            frames_w.append(
+                space.newtuple([
+                    frame.pycode.w_filename,
+                    frame.fget_f_lineno(space),
+                    space.newtext(frame.pycode.co_name)]))
+            frame = ec.getnextframe_nohidden(frame)
+            if frame is None:
+                break
+        self.w_cr_origin = space.newtuple(frames_w)
+
     def descr__await__(self, space):
         return CoroutineWrapper(self)
 
     def _finalize_(self):
         # If coroutine was never awaited on issue a RuntimeWarning.
-        if self.pycode is not None and \
-           self.frame is not None and \
-           self.frame.last_instr == -1:
+        if (self.pycode is not None and
+                self.frame is not None and
+                self.frame.last_instr == -1):
             space = self.space
-            msg = "coroutine '%s' was never awaited" % self.get_qualname()
-            space.warn(space.newtext(msg), space.w_RuntimeWarning)
+            w_mod = space.getbuiltinmodule("_warnings")
+            w_f = space.getattr(w_mod, space.newtext("_warn_unawaited_coroutine"))
+            space.call_function(w_f, self)
         GeneratorOrCoroutine._finalize_(self)
 
 
diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -266,6 +266,7 @@
             gen = Coroutine(self, name, qualname)
             ec = space.getexecutioncontext()
             w_wrapper = ec.w_coroutine_wrapper_fn
+            gen.capture_origin(ec)
         elif flags & pycode.CO_ASYNC_GENERATOR:
             from pypy.interpreter.generator import AsyncGenerator
             gen = AsyncGenerator(self, name, qualname)
diff --git a/pypy/interpreter/test/apptest_coroutine.py b/pypy/interpreter/test/apptest_coroutine.py
--- a/pypy/interpreter/test/apptest_coroutine.py
+++ b/pypy/interpreter/test/apptest_coroutine.py
@@ -840,3 +840,65 @@
         assert finalized == 2
     finally:
         sys.set_asyncgen_hooks(*old_hooks)
+
+def test_coroutine_capture_origin():
+    import contextlib
+
+    def here():
+        f = sys._getframe().f_back
+        return (f.f_code.co_filename, f.f_lineno)
+
+    try:
+        async def corofn():
+            pass
+
+        with contextlib.closing(corofn()) as coro:
+            assert coro.cr_origin is None
+
+        sys.set_coroutine_origin_tracking_depth(1)
+
+        fname, lineno = here()
+        with contextlib.closing(corofn()) as coro:
+            print(coro.cr_origin)
+            assert coro.cr_origin == (
+                (fname, lineno + 1, "test_coroutine_capture_origin"),)
+
+
+        sys.set_coroutine_origin_tracking_depth(2)
+
+        def nested():
+            return (here(), corofn())
+        fname, lineno = here()
+        ((nested_fname, nested_lineno), coro) = nested()
+        with contextlib.closing(coro):
+            print(coro.cr_origin)
+            assert coro.cr_origin == (
+                (nested_fname, nested_lineno, "nested"),
+                (fname, lineno + 1, "test_coroutine_capture_origin"))
+
+        # Check we handle running out of frames correctly
+        sys.set_coroutine_origin_tracking_depth(1000)
+        with contextlib.closing(corofn()) as coro:
+            print(coro.cr_origin)
+            assert 1 <= len(coro.cr_origin) < 1000
+    finally:
+        sys.set_coroutine_origin_tracking_depth(0)
+
+def test_runtime_warning_origin_tracking():
+    import gc, warnings  # XXX: importing warnings is expensive untranslated
+    async def foobaz():
+        pass
+    gc.collect()   # emit warnings from unrelated older tests
+    with warnings.catch_warnings(record=True) as l:
+        foobaz()
+        gc.collect()
+        gc.collect()
+        gc.collect()
+
+    assert len(l) == 1, repr(l)
+    w = l[0].message
+    assert isinstance(w, RuntimeWarning)
+    assert str(w).startswith("coroutine ")
+    assert str(w).endswith("foobaz' was never awaited")
+    assert "test_runtime_warning_origin_tracking" in str(w)
+
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -865,6 +865,7 @@
     cr_frame   = GetSetProperty(Coroutine.descr_gicr_frame),
     cr_code    = interp_attrproperty_w('pycode', cls=Coroutine),
     cr_await=GetSetProperty(Coroutine.descr_delegate),
+    cr_origin  = interp_attrproperty_w('w_cr_origin', cls=Coroutine),
     __name__   = GetSetProperty(Coroutine.descr__name__,
                                 Coroutine.descr_set__name__,
                                 doc="name of the coroutine"),
diff --git a/pypy/module/_warnings/app_warnings.py b/pypy/module/_warnings/app_warnings.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/_warnings/app_warnings.py
@@ -0,0 +1,15 @@
+def _warn_unawaited_coroutine(coro):
+    from _warnings import warn
+    msg_lines = [
+        f"coroutine '{coro.__qualname__}' was never awaited\n"
+    ]
+    if coro.cr_origin is not None:
+        import linecache, traceback
+        def extract():
+            for filename, lineno, funcname in reversed(coro.cr_origin):
+                line = linecache.getline(filename, lineno)
+                yield (filename, lineno, funcname, line)
+        msg_lines.append("Coroutine created at (most recent call last)\n")
+        msg_lines += traceback.format_list(list(extract()))
+    msg = "".join(msg_lines).rstrip("\n")
+    warn(msg, category=RuntimeWarning, stacklevel=2, source=coro)
diff --git a/pypy/module/_warnings/moduledef.py b/pypy/module/_warnings/moduledef.py
--- a/pypy/module/_warnings/moduledef.py
+++ b/pypy/module/_warnings/moduledef.py
@@ -11,6 +11,7 @@
     }
 
     appleveldefs = {
+        '_warn_unawaited_coroutine' : 'app_warnings._warn_unawaited_coroutine',
     }
 
     def setup_after_space_initialization(self):
diff --git a/pypy/module/sys/moduledef.py b/pypy/module/sys/moduledef.py
--- a/pypy/module/sys/moduledef.py
+++ b/pypy/module/sys/moduledef.py
@@ -100,6 +100,9 @@
         'set_asyncgen_hooks'    : 'vm.set_asyncgen_hooks',
 
         'is_finalizing'         : 'vm.is_finalizing',
+
+        'get_coroutine_origin_tracking_depth': 'vm.get_coroutine_origin_tracking_depth',
+        'set_coroutine_origin_tracking_depth': 'vm.set_coroutine_origin_tracking_depth',
         }
 
     if sys.platform == 'win32':
diff --git a/pypy/module/sys/test/test_sysmodule.py b/pypy/module/sys/test/test_sysmodule.py
--- a/pypy/module/sys/test/test_sysmodule.py
+++ b/pypy/module/sys/test/test_sysmodule.py
@@ -812,6 +812,20 @@
         assert cur.firstiter is None
         assert cur.finalizer is None
 
+    def test_coroutine_origin_tracking_depth(self):
+        import sys
+        depth = sys.get_coroutine_origin_tracking_depth()
+        assert depth == 0
+        try:
+            sys.set_coroutine_origin_tracking_depth(6)
+            depth = sys.get_coroutine_origin_tracking_depth()
+            assert depth == 6
+            with raises(ValueError):
+                sys.set_coroutine_origin_tracking_depth(-5)
+        finally:
+            sys.set_coroutine_origin_tracking_depth(0)
+
+
 
 class AppTestSysSettracePortedFromCpython(object):
     def test_sys_settrace(self):
diff --git a/pypy/module/sys/vm.py b/pypy/module/sys/vm.py
--- a/pypy/module/sys/vm.py
+++ b/pypy/module/sys/vm.py
@@ -402,3 +402,26 @@
 
 def is_finalizing(space):
     return space.newbool(space.sys.finalizing)
+
+def get_coroutine_origin_tracking_depth(space):
+    """get_coroutine_origin_tracking_depth()
+        Check status of origin tracking for coroutine objects in this thread.
+    """
+    ec = space.getexecutioncontext()
+    return space.newint(ec.coroutine_origin_tracking_depth)
+
+ at unwrap_spec(depth=int)
+def set_coroutine_origin_tracking_depth(space, depth):
+    """set_coroutine_origin_tracking_depth(depth)
+        Enable or disable origin tracking for coroutine objects in this thread.
+
+        Coroutine objects will track 'depth' frames of traceback information
+        about where they came from, available in their cr_origin attribute.
+
+        Set a depth of 0 to disable.
+    """
+    if depth < 0:
+        raise oefmt(space.w_ValueError,
+                "depth must be >= 0")
+    ec = space.getexecutioncontext()
+    ec.coroutine_origin_tracking_depth = depth

From pypy.commits at gmail.com  Fri Jan 31 16:48:43 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 13:48:43 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: fix error msg
Message-ID: <5e34a0bb.1c69fb81.e756c.0e75@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98619:4e018a19da74
Date: 2020-01-31 22:31 +0100
http://bitbucket.org/pypy/pypy/changeset/4e018a19da74/

Log:	fix error msg

diff --git a/pypy/objspace/descroperation.py b/pypy/objspace/descroperation.py
--- a/pypy/objspace/descroperation.py
+++ b/pypy/objspace/descroperation.py
@@ -598,6 +598,8 @@
     left, right = specialnames
     op = getattr(operator, left)
     def comparison_impl(space, w_obj1, w_obj2):
+        w_orig_obj1 = w_obj1
+        w_orig_obj2 = w_obj2
         w_typ1 = space.type(w_obj1)
         w_typ2 = space.type(w_obj2)
         w_left_src, w_left_impl = space.lookup_in_type_where(w_typ1, left)
@@ -637,7 +639,7 @@
         # if we arrived here, they are unorderable
         raise oefmt(space.w_TypeError,
                     "'%s' not supported between instances of '%T' and '%T'",
-                    symbol, w_obj1, w_obj2)
+                    symbol, w_orig_obj1, w_orig_obj2)
 
     return func_with_new_name(comparison_impl, 'comparison_%s_impl'%left.strip('_'))
 
diff --git a/pypy/objspace/test/test_descroperation.py b/pypy/objspace/test/test_descroperation.py
--- a/pypy/objspace/test/test_descroperation.py
+++ b/pypy/objspace/test/test_descroperation.py
@@ -343,6 +343,19 @@
         raises(TypeError, "0.0 < zz()")
         raises(TypeError, "0j < zz()")
 
+    def test_correct_order_error_msg(self):
+        class A(object):
+            def __lt__(self, other):
+                return NotImplemented
+            __gt__ = __lt__
+
+        class B(A):
+            pass
+
+        with raises(TypeError) as e:
+            A() < B()
+        assert str(e.value) == "'<' not supported between instances of 'A' and 'B'"
+
     def test_equality_among_different_types(self):
         class A(object): pass
         class zz(object): pass

From pypy.commits at gmail.com  Fri Jan 31 16:48:12 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 13:48:12 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: we happily pass these...
Message-ID: <5e34a09c.1c69fb81.1361c.d338@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98618:bf0519b39ac6
Date: 2020-01-31 22:11 +0100
http://bitbucket.org/pypy/pypy/changeset/bf0519b39ac6/

Log:	we happily pass these...

diff --git a/lib-python/3/test/test_sys_settrace.py b/lib-python/3/test/test_sys_settrace.py
--- a/lib-python/3/test/test_sys_settrace.py
+++ b/lib-python/3/test/test_sys_settrace.py
@@ -473,7 +473,6 @@
         return Tracer(trace_line_events=False)
 
 
- at support.cpython_only
 class TraceOpcodesTestCase(TraceTestCase):
     """Repeat the trace tests, but with per-opcodes events enabled"""
 

From pypy.commits at gmail.com  Fri Jan 31 16:48:09 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 13:48:09 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: implement opcode tracing,
 make it possible to turn off line tracing
Message-ID: <5e34a099.1c69fb81.725dc.97ef@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98617:e446a354c3d0
Date: 2020-01-31 22:04 +0100
http://bitbucket.org/pypy/pypy/changeset/e446a354c3d0/

Log:	implement opcode tracing, make it possible to turn off line tracing

diff --git a/pypy/interpreter/executioncontext.py b/pypy/interpreter/executioncontext.py
--- a/pypy/interpreter/executioncontext.py
+++ b/pypy/interpreter/executioncontext.py
@@ -183,7 +183,8 @@
         if d.instr_lb <= frame.last_instr < d.instr_ub:
             if frame.last_instr < d.instr_prev_plus_one:
                 # We jumped backwards in the same line.
-                self._trace(frame, 'line', self.space.w_None)
+                if d.f_trace_lines:
+                    self._trace(frame, 'line', self.space.w_None)
         else:
             size = len(code.co_lnotab) / 2
             addr = 0
@@ -219,7 +220,10 @@
 
             if d.instr_lb == frame.last_instr: # At start of line!
                 d.f_lineno = line
-                self._trace(frame, 'line', self.space.w_None)
+                if d.f_trace_lines:
+                    self._trace(frame, 'line', self.space.w_None)
+        if d.f_trace_opcodes:
+            self._trace(frame, 'opcode', self.space.w_None)
 
         d.instr_prev_plus_one = frame.last_instr + 1
 
diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -36,6 +36,8 @@
     f_lineno                 = 0      # current lineno for tracing
     is_being_profiled        = False
     is_in_line_tracing       = False
+    f_trace_lines            = True
+    f_trace_opcodes          = False
     w_locals                 = None
     hidden_operationerr      = None
 
@@ -148,6 +150,18 @@
             return None
         return d.w_locals
 
+    def get_f_trace_lines(self):
+        d = self.getdebug()
+        if d is None:
+            return True
+        return d.f_trace_lines
+
+    def get_f_trace_opcodes(self):
+        d = self.getdebug()
+        if d is None:
+            return False
+        return d.f_trace_opcodes
+
     @not_rpython
     def __repr__(self):
         # useful in tracebacks
@@ -898,10 +912,17 @@
     def fdel_f_trace(self, space):
         self.getorcreatedebug().w_f_trace = None
 
-    def fget_f_restricted(self, space):
-        if space.config.objspace.honor__builtins__:
-            return space.newbool(self.builtin is not space.builtin)
-        return space.w_False
+    def fget_f_trace_lines(self, space):
+        return space.newbool(self.get_f_trace_lines())
+
+    def fset_f_trace_lines(self, space, w_trace):
+        self.getorcreatedebug().f_trace_lines = space.is_true(w_trace)
+
+    def fget_f_trace_opcodes(self, space):
+        return space.newbool(self.get_f_trace_opcodes())
+
+    def fset_f_trace_opcodes(self, space, w_trace):
+        self.getorcreatedebug().f_trace_opcodes = space.is_true(w_trace)
 
     def get_generator(self):
         if self.space.config.translation.rweakref:
diff --git a/pypy/interpreter/test/apptest_pyframe.py b/pypy/interpreter/test/apptest_pyframe.py
--- a/pypy/interpreter/test/apptest_pyframe.py
+++ b/pypy/interpreter/test/apptest_pyframe.py
@@ -584,6 +584,63 @@
     sys.settrace(None)
     assert res == 10
 
+def test_disable_line_tracing():
+    import sys
+    assert sys._getframe().f_trace_lines
+
+    l = []
+    def trace(frame, event, arg):
+        l.append((frame.f_code.co_name, event, arg, frame.f_lineno - frame.f_code.co_firstlineno))
+        frame.f_trace_lines = False
+        return trace
+    def g(n):
+        return n + 2
+    def f(n):
+        n = g(n)
+        return n * 7
+    sys.settrace(trace)
+    x = f(4)
+    sys.settrace(None)
+    print(l)
+    assert l == [('f', 'call', None, 0), ('g', 'call', None, 0), ('g', 'return', 6, 1), ('f', 'return', 42, 2)]
+
+test_disable_line_tracing()
+
+def test_opcode_tracing():
+    import sys
+    assert not sys._getframe().f_trace_opcodes
+
+    l = []
+    def trace(frame, event, arg):
+        l.append((frame.f_code.co_name, event, arg, frame.f_lasti, frame.f_lineno - frame.f_code.co_firstlineno))
+        frame.f_trace_opcodes = True
+        return trace
+    def g(n):
+        return n + 2
+    def f(n):
+        return g(n)
+    sys.settrace(trace)
+    x = f(4)
+    sys.settrace(None)
+    print(l)
+    assert l == [
+        ('f', 'call', None, -1, 0),
+        ('f', 'line', None, 0, 1),
+        ('f', 'opcode', None, 0, 1),
+        ('f', 'opcode', None, 2, 1),
+        ('f', 'opcode', None, 4, 1),
+        ('g', 'call', None, -1, 0),
+        ('g', 'line', None, 0, 1),
+        ('g', 'opcode', None, 0, 1),
+        ('g', 'opcode', None, 2, 1),
+        ('g', 'opcode', None, 4, 1),
+        ('g', 'opcode', None, 6, 1),
+        ('g', 'return', 6, 6, 1),
+        ('f', 'opcode', None, 6, 1),
+        ('f', 'return', 6, 6, 1)]
+
+test_opcode_tracing()
+
 def test_preserve_exc_state_in_generators():
     import sys
     def yield_raise():
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -654,7 +654,8 @@
     f_lasti = GetSetProperty(PyFrame.fget_f_lasti),
     f_trace = GetSetProperty(PyFrame.fget_f_trace, PyFrame.fset_f_trace,
                              PyFrame.fdel_f_trace),
-    f_restricted = GetSetProperty(PyFrame.fget_f_restricted),
+    f_trace_lines = GetSetProperty(PyFrame.fget_f_trace_lines, PyFrame.fset_f_trace_lines),
+    f_trace_opcodes = GetSetProperty(PyFrame.fget_f_trace_opcodes, PyFrame.fset_f_trace_opcodes),
     f_code = GetSetProperty(PyFrame.fget_code),
     f_locals = GetSetProperty(PyFrame.fget_getdictscope),
     f_globals = GetSetProperty(PyFrame.fget_w_globals),

From pypy.commits at gmail.com  Fri Jan 31 16:48:46 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 13:48:46 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: slight variant in error msg
Message-ID: <5e34a0be.1c69fb81.1cea4.e491@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98620:8d3b5e787554
Date: 2020-01-31 22:33 +0100
http://bitbucket.org/pypy/pypy/changeset/8d3b5e787554/

Log:	slight variant in error msg

diff --git a/lib-python/3/test/test_dataclasses.py b/lib-python/3/test/test_dataclasses.py
--- a/lib-python/3/test/test_dataclasses.py
+++ b/lib-python/3/test/test_dataclasses.py
@@ -3015,7 +3015,7 @@
                           lambda x:x,
                           ]:
             with self.subTest(bad_field=bad_field):
-                with self.assertRaisesRegex(TypeError, r'has no len\(\)'):
+                with self.assertRaisesRegex(TypeError, r'has no len.*'):
                     make_dataclass('C', ['a', bad_field])
 
     def test_duplicate_field_names(self):

From pypy.commits at gmail.com  Fri Jan 31 16:48:06 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 13:48:06 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: skip cpython only test
Message-ID: <5e34a096.1c69fb81.f2543.a7d3@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98616:98cbf9a6e204
Date: 2020-01-31 21:22 +0100
http://bitbucket.org/pypy/pypy/changeset/98cbf9a6e204/

Log:	skip cpython only test

diff --git a/lib-python/3/test/test_coroutines.py b/lib-python/3/test/test_coroutines.py
--- a/lib-python/3/test/test_coroutines.py
+++ b/lib-python/3/test/test_coroutines.py
@@ -2276,6 +2276,7 @@
         finally:
             sys.set_coroutine_origin_tracking_depth(orig_depth)
 
+    @support.cpython_only # pypy has this function in _warnings
     def test_unawaited_warning_when_module_broken(self):
         # Make sure we don't blow up too bad if
         # warnings._warn_unawaited_coroutine is broken somehow (e.g. because

From pypy.commits at gmail.com  Fri Jan 31 17:02:21 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 14:02:21 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: skip an implementation detail
Message-ID: <5e34a3ed.1c69fb81.ccdc8.87d7@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98621:cd4e6f012629
Date: 2020-01-31 22:52 +0100
http://bitbucket.org/pypy/pypy/changeset/cd4e6f012629/

Log:	skip an implementation detail

diff --git a/lib-python/3/test/test_types.py b/lib-python/3/test/test_types.py
--- a/lib-python/3/test/test_types.py
+++ b/lib-python/3/test/test_types.py
@@ -590,6 +590,7 @@
         self.assertIsInstance(object().__lt__, types.MethodWrapperType)
         self.assertIsInstance((42).__lt__, types.MethodWrapperType)
 
+    @impl_detail
     def test_method_descriptor_types(self):
         self.assertIsInstance(str.join, types.MethodDescriptorType)
         self.assertIsInstance(list.append, types.MethodDescriptorType)

From pypy.commits at gmail.com  Fri Jan 31 17:02:23 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 14:02:23 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: gah! turning StopIteration to
 RuntimeError in generators broke the applevel
Message-ID: <5e34a3ef.1c69fb81.d8ebe.cc77@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98622:7a0cdcf24b94
Date: 2020-01-31 23:01 +0100
http://bitbucket.org/pypy/pypy/changeset/7a0cdcf24b94/

Log:	gah! turning StopIteration to RuntimeError in generators broke the
	applevel implementation of iter with sentinel!

diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -163,6 +163,7 @@
         self.frame.w_yielding_from = w_delegate
 
     def _leak_stopiteration(self, e):
+        import pdb; pdb.set_trace()
         # turn a leaking StopIteration into RuntimeError (with its cause set
         # appropriately).
         space = self.space
diff --git a/pypy/interpreter/test/apptest_generator.py b/pypy/interpreter/test/apptest_generator.py
--- a/pypy/interpreter/test/apptest_generator.py
+++ b/pypy/interpreter/test/apptest_generator.py
@@ -803,6 +803,21 @@
     with raises(RuntimeError):
         next(badgenerator(5))
 
+def test_stopiteration_can_be_caught():
+    def g():
+        raise StopIteration
+    def finegenerator(x):
+        yield x
+        if x == 5:
+            try:
+                g()
+            except StopIteration:
+                pass
+        yield x
+    gen = finegenerator(5)
+    next(gen) # fine
+    next(gen) # fine
+
 def test_generator_stop_cause():
     def gen1():
         yield 42
diff --git a/pypy/module/__builtin__/operation.py b/pypy/module/__builtin__/operation.py
--- a/pypy/module/__builtin__/operation.py
+++ b/pypy/module/__builtin__/operation.py
@@ -126,7 +126,10 @@
 
     def iter_generator(callable_, sentinel):
         while 1:
-            result = callable_()
+            try:
+                result = callable_()
+            except StopIteration:
+                return
             if result == sentinel:
                 return
             yield result
diff --git a/pypy/module/__builtin__/test/test_builtin.py b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -286,17 +286,20 @@
                 self.value = 0
             def __call__(self):
                 self.value += 1
+                if self.value > 10:
+                    raise StopIteration
                 return self.value
-        # XXX Raising errors is quite slow --
-        #            uncomment these lines when fixed
-        #self.assertRaises(TypeError,iter,3,5)
-        #self.assertRaises(TypeError,iter,[],5)
-        #self.assertRaises(TypeError,iter,{},5)
+        with raises(TypeError):
+            iter(3, 5)
+
         x = iter(count(),3)
         assert next(x) ==1
         assert next(x) ==2
         raises(StopIteration, next, x)
 
+        # a case that runs till the end
+        assert list(iter(count(), 100)) == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+
     def test_enumerate(self):
         import sys
         seq = range(2,4)

From pypy.commits at gmail.com  Fri Jan 31 17:30:16 2020
From: pypy.commits at gmail.com (cfbolz)
Date: Fri, 31 Jan 2020 14:30:16 -0800 (PST)
Subject: [pypy-commit] pypy py3.7: make putenv complain about bad names
 (test already existed)
Message-ID: <5e34aa78.1c69fb81.fc43d.cb31@mx.google.com>

Author: Carl Friedrich Bolz-Tereick 
Branch: py3.7
Changeset: r98624:89255ed57e9f
Date: 2020-01-31 23:29 +0100
http://bitbucket.org/pypy/pypy/changeset/89255ed57e9f/

Log:	make putenv complain about bad names (test already existed)

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -935,9 +935,21 @@
     def putenv(space, w_name, w_value):
         """Change or add an environment variable."""
         try:
-            dispatch_filename_2(rposix.putenv)(space, w_name, w_value)
+            dispatch_filename_2(putenv_impl)(space, w_name, w_value)
         except OSError as e:
             raise wrap_oserror(space, e, eintr_retry=False)
+        except ValueError:
+            raise oefmt(space.w_ValueError,
+                    "illegal environment variable name")
+
+    @specialize.argtype(0, 1)
+    def putenv_impl(name, value):
+        from rpython.rlib.rposix import _as_bytes
+        name = _as_bytes(name)
+        value = _as_bytes(value)
+        if "=" in name:
+            raise ValueError
+        return rposix.putenv(name, value)
 
     def unsetenv(space, w_name):
         """Delete an environment variable."""