From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gustaf Waldemarson Newsgroups: gmane.emacs.bugs Subject: bug#62696: python.el: Extra indentation for conditionals Date: Tue, 11 Apr 2023 13:11:54 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000cb6d6a05f90d8fff" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18544"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 62696@debbugs.gnu.org To: kobarity Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Apr 11 13:13:17 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pmBw2-0004eL-OM for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 11 Apr 2023 13:13:14 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmBvs-0003hP-I7; Tue, 11 Apr 2023 07:13:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmBvr-0003gi-2s for bug-gnu-emacs@gnu.org; Tue, 11 Apr 2023 07:13:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmBvq-0007DX-QE for bug-gnu-emacs@gnu.org; Tue, 11 Apr 2023 07:13:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmBvq-0007D7-IK for bug-gnu-emacs@gnu.org; Tue, 11 Apr 2023 07:13:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Gustaf Waldemarson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 11 Apr 2023 11:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62696 X-GNU-PR-Package: emacs Original-Received: via spool by 62696-submit@debbugs.gnu.org id=B62696.168121153427657 (code B ref 62696); Tue, 11 Apr 2023 11:13:02 +0000 Original-Received: (at 62696) by debbugs.gnu.org; 11 Apr 2023 11:12:14 +0000 Original-Received: from localhost ([127.0.0.1]:36723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmBv3-0007C0-LA for submit@debbugs.gnu.org; Tue, 11 Apr 2023 07:12:14 -0400 Original-Received: from mail-yw1-f169.google.com ([209.85.128.169]:33495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmBv1-0007Bg-Fw for 62696@debbugs.gnu.org; Tue, 11 Apr 2023 07:12:12 -0400 Original-Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-54ee0b73e08so153858337b3.0 for <62696@debbugs.gnu.org>; Tue, 11 Apr 2023 04:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681211526; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=T/m0R0j4SoujoWMZiR7z3CK6U4U5YrmqA59gZnvvcmM=; b=hXqlkRBjTJ5az2WiHbkHFXhA43gLsNIDSTzvQ+ZMTmmYsRpoYjnhdCFw4/D9o3aPtl cvrTRLHTuXdUuzMm4jFE2OqSCeooudcIQwIsbZtRXiGWcjy8I2z7AAV4wstpu9Wkm2mz MB+q3zbFmL6j05HZHDk2qQUUf8xbRpAhKC+tCFGiIF892ZmA4/+WHCrEdszQ0KW9Osxf g+J/09y760wWMWiDnTeUubXw8mM0dWtSo4xM12lYxobziice0rlbNAqlvqQ1wiEj1078 d3lOE1/x+5IsuDfGdwIZi2LufQ99oMydjHrjBrKL+/7YoB+qrej/5fdYyHznlJZPmAcS 5ezA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681211526; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=T/m0R0j4SoujoWMZiR7z3CK6U4U5YrmqA59gZnvvcmM=; b=zj9/BlSL6YSaeKUkP5wlt+EUg0QRTbICJUuNDU20hCHWeHDDq3+5biosWZGBmbao6+ Iz+bFkqNf2SH7l59ZFf0rhS0KRvyBlo1cgiR39hoLG1xxwiAZzRsT77Yfz8/YBbCoQSP E5RJELILVLnZiC4GT7gt9vb4G53SZrD8htnXUuZkTVOdiHoruWPa+vROC642YU4iyNRm oC1oat2Lj8BgBMpfhPp1tZCd/GUJ0cYOkem/B4XN0jkz0GWYhxeek8CB9wc/Xg8uVX1e Bt0BvEjIav0p2L5UqjPJHD8XH+F8mtJo70xS5MYpilPTG33q8F/C9bsyls20YgbBq+td xR0w== X-Gm-Message-State: AAQBX9cPtGyFwVcZPr+EAiP9p2PbGQ/D3gCeVuA9nOT05+ykMt2wAGZE ARvd59AgoqbhnQ20QgH1beXTD4tAsRb90MYRt6g= X-Google-Smtp-Source: AKy350YWCzdmcvu+P5krev81e136R6+FIF/Ax40jn6vtH4AcG6+pUXWaompy9zTSahXT/uu51nRkzq6Ec/s1emuQyyE= X-Received: by 2002:a81:af65:0:b0:544:b864:5532 with SMTP id x37-20020a81af65000000b00544b8645532mr7399672ywj.3.1681211525897; Tue, 11 Apr 2023 04:12:05 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:259631 Archived-At: --000000000000cb6d6a05f90d8fff Content-Type: multipart/alternative; boundary="000000000000cb6d6705f90d8ffd" --000000000000cb6d6705f90d8ffd Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Kobarity, Being Swedish, I am hardly an authority on the English language. That said, I went ahead and double-checked the docstring and such, and the only thing that I found a bit confusing is the `python-indent-block-paren-deeper` description as follows: "Increase indentation inside parens of a block. When this variable is set to non-nil and the contents of a block inside parens are indented to the same level as outside the same block, increase the indentation of the line." This is really nitpicking though, and I may be using some terms incorrectly since since I don't know a lot of the internals here, so feel free to disregard any of this. These changes are also available in attached patch, feel free to use it if need be! Best regards, Gustaf Den m=C3=A5n 10 apr. 2023 kl 17:21 skrev kobarity : > > Gustaf Waldemarson wrote: > > Thanks a lot for this! I had no idea that they had changed the relevant > PEPs to account > > for this, but as mentioned it is still a good idea to have the option t= o > change this depending > > on your preference. And as far as I have been able to tell from coding > with this patch for a > > few hours, it seems to work beautifully and I would love to see this as > an official feature! > > Hi Gustaf, > > Thank you for testing my patch. I am relieved that it seems to have > fulfilled your request. > > As I am not a native English speaker, I welcome any feedback from > anyone on the name and/or docstrings of the new user option as well as > on the behavior and coding. > --000000000000cb6d6705f90d8ffd Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Kobarity,

Being Swedis= h, I am hardly an authority on the English language. That said, I went
ahead and double-checked the docstring and such, and the only thing t= hat I found a
bit confusing is the `python-indent-block-paren-dee= per` description as follows:

"Increase indent= ation inside parens of a block.
When this variable is set to non-nil and= the contents of a block
inside parens are indented to the same level as= outside the same
block, increase the indentation of the line."
=

This is really nitpicking though, and I may be us= ing some terms incorrectly since
since I don't know a lot of = the internals here, so feel free to disregard any of this. These
= changes are also available in attached patch, feel free to use it if need b= e!

Best regards,
Gustaf

Den= m=C3=A5n 10 apr. 2023 kl 17:21 skrev kobarity <kobarity@gmail.com>:

Gustaf Waldemarson wrote:
> Thanks a lot for this! I had no idea that they had changed the relevan= t PEPs to account
> for this, but as mentioned it is still a good idea to have the option = to change this depending
> on your preference. And as far as I have been able to tell from coding= with this patch for a
> few hours, it seems to work beautifully and I would love to see this a= s an official feature!

Hi Gustaf,

Thank you for testing my patch.=C2=A0 I am relieved that it seems to have fulfilled your request.

As I am not a native English speaker, I welcome any feedback from
anyone on the name and/or docstrings of the new user option as well as
on the behavior and coding.
--000000000000cb6d6705f90d8ffd-- --000000000000cb6d6a05f90d8fff Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Add-a-new-user-option-in-Python-mode-to-improve-indent-2.patch" Content-Disposition: attachment; filename="0001-Add-a-new-user-option-in-Python-mode-to-improve-indent-2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lgc5w41x0 RnJvbSBlYTJkZTA3MTY0Y2VlODBhODUyMjZlNjhiODM2OTJkNmVlZGE0ZjQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBrb2Jhcml0eSA8a29iYXJpdHlAZ21haWwuY29tPgpEYXRlOiBT dW4sIDkgQXByIDIwMjMgMjA6NDg6MDAgKzA5MDAKU3ViamVjdDogW1BBVENIXSBBZGQgYSBuZXcg dXNlciBvcHRpb24gaW4gUHl0aG9uIG1vZGUgdG8gaW1wcm92ZSB0aGUKIGluZGVudGF0aW9uCgoq IGxpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCAocHl0aG9uLWluZGVudC1ibG9jay1wYXJlbi1kZWVw ZXIpOiBOZXcKdXNlciBvcHRpb24uCihweXRob24taW5kZW50LWNvbnRleHQpOiBBZGQgYSBuZXcg Y29udGV4dCA6aW5zaWRlLXBhcmVuLWZyb20tYmxvY2suCihweXRob24taW5kZW50LS1jYWxjdWxh dGUtaW5kZW50YXRpb24pOiBNb2RpZnkgYWNjb3JkaW5nIHRvCmBweXRob24taW5kZW50LWJsb2Nr LXBhcmVuLWRlZXBlcicgYW5kIDppbnNpZGUtcGFyZW4tZnJvbS1ibG9jay4KKiB0ZXN0L2xpc3Av cHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbAoocHl0aG9uLWluZGVudC1pbnNpZGUtcGFyZW4tYmxv Y2stMSkKKHB5dGhvbi1pbmRlbnQtaW5zaWRlLXBhcmVuLWJsb2NrLTIpCihweXRob24taW5kZW50 LWluc2lkZS1wYXJlbi1ibG9jay0zKQoocHl0aG9uLWluZGVudC1pbnNpZGUtcGFyZW4tYmxvY2st NCk6IE5ldyB0ZXN0cy4KKHB5dGhvbi1pbmRlbnQtaW5zaWRlLXBhcmVuLTUsIHB5dGhvbi1pbmRl bnQtZGVkZW50ZXJzLTgpOiBNb2RpZnkKYWNjb3JkaW5nIHRvIHRoZSBuZXcgY29udGV4dC4KKiBl dGMvTkVXUzogRG9jdW1lbnQgdGhlIG5ldyB1c2VyIG9wdGlvbi4gIChCdWcjNjI2OTYpCi0tLQog ZXRjL05FV1MgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDggKysKIGxpc3AvcHJvZ21v ZGVzL3B5dGhvbi5lbCAgICAgICAgICAgIHwgIDQxICsrKysrKysrLS0KIHRlc3QvbGlzcC9wcm9n bW9kZXMvcHl0aG9uLXRlc3RzLmVsIHwgMTE2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0K IDMgZmlsZXMgY2hhbmdlZCwgMTU2IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZXRjL05FV1MgYi9ldGMvTkVXUwppbmRleCA1ZTFmZDc2ZTk5ZS4uMWZkOTdjMzUy MDggMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0yNjYsNiArMjY2LDE0 IEBAIFdoZW4gbm9uLW5pbCwgaXQgd2lsbCBhdXRvbWF0aWNhbGx5IHJlZ2lzdGVyIGV2ZXJ5IHBh Y2thZ2UgYXMgYQogcHJvamVjdCwgdGhhdCB5b3UgY2FuIHF1aWNrbHkgc2VsZWN0IHVzaW5nICdw cm9qZWN0LXN3aXRjaC1wcm9qZWN0JwogKCdDLXggcCBwJykuCiAKKyoqIFB5dGhvbiBtb2RlCisK KyoqKiBOZXcgdXNlciBvcHRpb24gJ3B5dGhvbi1pbmRlbnQtYmxvY2stcGFyZW4tZGVlcGVyJy4K K0luY3JlYXNlIGluZGVudGF0aW9uIGluc2lkZSBwYXJlbnMgb2YgYSBibG9jay4KK1doZW4gdGhp cyB2YXJpYWJsZSBpcyBzZXQgdG8gbm9uLW5pbCBhbmQgdGhlIGNvbnRlbnRzIG9mIGEgYmxvY2sK K2luc2lkZSBwYXJlbnMgYXJlIGluZGVudGVkIHRvIHRoZSBzYW1lIGxldmVsIGFzIG91dHNpZGUg dGhlIHNhbWUKK2Jsb2NrLCBpbmNyZWFzZSB0aGUgaW5kZW50YXRpb24gb2YgdGhlIGxpbmUuCisK IAwKICogTmV3IE1vZGVzIGFuZCBQYWNrYWdlcyBpbiBFbWFjcyAzMC4xCiAKZGlmZiAtLWdpdCBh L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBiL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbAppbmRl eCBiYmFiY2U4MGI0ZC4uMDg2OGI3N2YyMDEgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL3B5 dGhvbi5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9weXRob24uZWwKQEAgLTEyNzAsNiArMTI3MCwx NSBAQCBweXRob24taW5kZW50LWRlZi1ibG9jay1zY2FsZQogICA6dHlwZSAnaW50ZWdlcgogICA6 c2FmZSAnbmF0bnVtcCkKIAorKGRlZmN1c3RvbSBweXRob24taW5kZW50LWJsb2NrLXBhcmVuLWRl ZXBlciBuaWwKKyAgIkluY3JlYXNlIGluZGVudGF0aW9uIGluc2lkZSBwYXJlbnMgb2YgYSBibG9j ay4KK1doZW4gdGhpcyB2YXJpYWJsZSBpcyBzZXQgdG8gbm9uLW5pbCBhbmQgdGhlIGNvbnRlbnRz IG9mIGEgYmxvY2sKK2luc2lkZSBwYXJlbnMgYXJlIGluZGVudGVkIHRvIHRoZSBzYW1lIGxldmVs IGFzIG91dHNpZGUgdGhlIHNhbWUKK2Jsb2NrLCBpbmNyZWFzZSB0aGUgaW5kZW50YXRpb24gb2Yg dGhlIGxpbmUuIgorICA6dmVyc2lvbiAiMzAuMSIKKyAgOnR5cGUgJ2Jvb2xlYW4KKyAgOnNhZmUg J2Jvb2xlYW5wKQorCiAoZGVmdmFyIHB5dGhvbi1pbmRlbnQtY3VycmVudC1sZXZlbCAwCiAgICJE ZXByZWNhdGVkIHZhciBhdmFpbGFibGUgZm9yIGNvbXBhdGliaWxpdHkuIikKIApAQCAtMTM2Nyw2 ICsxMzc2LDEwIEBAIHB5dGhvbi1pbmRlbnQtY29udGV4dAogIC0gUG9pbnQgaXMgaW5zaWRlIGEg cGFyZW4gd2l0aCBpdGVtcyBzdGFydGluZyBpbiB0aGVpciBvd24gbGluZQogICAgZnJvbSBhIGJs b2NrIHN0YXJ0LgogIC0gU1RBUlQgaXMgdGhlIHBvc2l0aW9uIG9mIHRoZSBvcGVuIHBhcmVuLgor Omluc2lkZS1wYXJlbi1mcm9tLWJsb2NrCisgLSBQb2ludCBpcyBpbnNpZGUgYSBwYXJlbiBmcm9t IGEgYmxvY2sgc3RhcnQgZm9sbG93ZWQgYnkgc29tZQorICAgaXRlbXMgb24gdGhlIHNhbWUgbGlu ZS4KKyAtIFNUQVJUIGlzIHRoZSBmaXJzdCBub24gc3BhY2UgY2hhciBwb3NpdGlvbiAqYWZ0ZXIq IHRoZSBvcGVuIHBhcmVuLgogCiA6YWZ0ZXItYmFja3NsYXNoCiAgLSBGYWxsYmFjayBjYXNlIHdo ZW4gcG9pbnQgaXMgYWZ0ZXIgYmFja3NsYXNoLgpAQCAtMTQ1MCwxMiArMTQ2MywxNiBAQCBweXRo b24taW5kZW50LWNvbnRleHQKICAgICAgICAgICAgICAoc3RhcnRzLWluLW5ld2xpbmUKICAgICAg ICAgICAgICAgKGNvbnMgOmluc2lkZS1wYXJlbi1uZXdsaW5lLXN0YXJ0IHN0YXJ0KSkKICAgICAg ICAgICAgICA7OyBHZW5lcmFsIGNhc2UuCi0gICAgICAgICAgICAgKHQgKGNvbnMgOmluc2lkZS1w YXJlbgotICAgICAgICAgICAgICAgICAgICAgIChzYXZlLWV4Y3Vyc2lvbgotICAgICAgICAgICAg ICAgICAgICAgICAgKGdvdG8tY2hhciAoMSsgc3RhcnQpKQotICAgICAgICAgICAgICAgICAgICAg ICAgKHNraXAtc3ludGF4LWZvcndhcmQgIigiIDEpCi0gICAgICAgICAgICAgICAgICAgICAgICAo c2tpcC1zeW50YXgtZm9yd2FyZCAiICIpCi0gICAgICAgICAgICAgICAgICAgICAgICAocG9pbnQp KSkpKSkpKQorICAgICAgICAgICAgICh0IChsZXQgKChhZnRlci1zdGFydCAoc2F2ZS1leGN1cnNp b24KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZ290by1jaGFyICgxKyBzdGFydCkp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNraXAtc3ludGF4LWZvcndhcmQgIigi IDEpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNraXAtc3ludGF4LWZvcndhcmQg IiAiKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwb2ludCkpKSkKKyAgICAgICAg ICAgICAgICAgIChpZiAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgICAgIChw eXRob24tbmF2LWJlZ2lubmluZy1vZi1zdGF0ZW1lbnQpCisgICAgICAgICAgICAgICAgICAgICAg ICAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2spKQorICAgICAgICAg ICAgICAgICAgICAgIChjb25zIDppbnNpZGUtcGFyZW4tZnJvbS1ibG9jayBhZnRlci1zdGFydCkK KyAgICAgICAgICAgICAgICAgICAgKGNvbnMgOmluc2lkZS1wYXJlbiBhZnRlci1zdGFydCkpKSkp KSkpCiAgICAgICAgOzsgQWZ0ZXIgYmFja3NsYXNoLgogICAgICAgICgobGV0ICgoc3RhcnQgKHdo ZW4gKG5vdCAocHl0aG9uLXN5bnRheC1jb21tZW50LW9yLXN0cmluZy1wIHBwc3MpKQogICAgICAg ICAgICAgICAgICAgICAgICAocHl0aG9uLWluZm8tbGluZS1lbmRzLWJhY2tzbGFzaC1wCkBAIC0x NjAzLDcgKzE2MjAsMTcgQEAgcHl0aG9uLWluZGVudC0tY2FsY3VsYXRlLWluZGVudGF0aW9uCiAg ICAgICAgIChgKCwob3IgOmluc2lkZS1wYXJlbi1uZXdsaW5lLXN0YXJ0LWZyb20tYmxvY2spIC4g LHN0YXJ0KQogICAgICAgICAgKGdvdG8tY2hhciBzdGFydCkKICAgICAgICAgICgrIChjdXJyZW50 LWluZGVudGF0aW9uKQotICAgICAgICAgICAgKCogcHl0aG9uLWluZGVudC1vZmZzZXQgcHl0aG9u LWluZGVudC1kZWYtYmxvY2stc2NhbGUpKSkpKSkKKyAgICAgICAgICAgICgqIHB5dGhvbi1pbmRl bnQtb2Zmc2V0IHB5dGhvbi1pbmRlbnQtZGVmLWJsb2NrLXNjYWxlKSkpCisgICAgICAgIChgKCw6 aW5zaWRlLXBhcmVuLWZyb20tYmxvY2sgLiAsc3RhcnQpCisgICAgICAgICAoZ290by1jaGFyIHN0 YXJ0KQorICAgICAgICAgKGxldCAoKGNvbHVtbiAoY3VycmVudC1jb2x1bW4pKSkKKyAgICAgICAg ICAgKGlmIChhbmQgcHl0aG9uLWluZGVudC1ibG9jay1wYXJlbi1kZWVwZXIKKyAgICAgICAgICAg ICAgICAgICAgKD0gY29sdW1uICgrIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAocHl0aG9uLW5hdi1iZWdpbm5pbmctb2Ytc3RhdGVtZW50KQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY3VycmVudC1pbmRlbnRhdGlvbikpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBweXRob24taW5kZW50LW9mZnNldCkpKQor ICAgICAgICAgICAgICAgKCsgY29sdW1uIHB5dGhvbi1pbmRlbnQtb2Zmc2V0KQorICAgICAgICAg ICAgIGNvbHVtbikpKSkpKQogCiAoZGVmdW4gcHl0aG9uLWluZGVudC0tY2FsY3VsYXRlLWxldmVs cyAoaW5kZW50YXRpb24pCiAgICJDYWxjdWxhdGUgbGV2ZWxzIGxpc3QgZ2l2ZW4gSU5ERU5UQVRJ T04uCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbCBiL3Rl c3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCmluZGV4IDUwMTUzZTY2ZGE1Li42MGIx MWQ1NzJjZiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL3Byb2dtb2Rlcy9weXRob24tdGVzdHMuZWwK KysrIGIvdGVzdC9saXNwL3Byb2dtb2Rlcy9weXRob24tdGVzdHMuZWwKQEAgLTExMzksNyArMTEz OSw3IEBAIHB5dGhvbi1pbmRlbnQtaW5zaWRlLXBhcmVuLTUKICAgIChzaG91bGQgKGVxIChjYXIg KHB5dGhvbi1pbmRlbnQtY29udGV4dCkpIDpuby1pbmRlbnQpKQogICAgKHNob3VsZCAoPSAocHl0 aG9uLWluZGVudC1jYWxjdWxhdGUtaW5kZW50YXRpb24pIDApKQogICAgKGZvcndhcmQtbGluZSAx KQotICAgKHNob3VsZCAoZXEgKGNhciAocHl0aG9uLWluZGVudC1jb250ZXh0KSkgOmluc2lkZS1w YXJlbikpCisgICAoc2hvdWxkIChlcSAoY2FyIChweXRob24taW5kZW50LWNvbnRleHQpKSA6aW5z aWRlLXBhcmVuLWZyb20tYmxvY2spKQogICAgKHNob3VsZCAoPSAocHl0aG9uLWluZGVudC1jYWxj dWxhdGUtaW5kZW50YXRpb24pIDcpKQogICAgKGZvcndhcmQtbGluZSAxKQogICAgKHNob3VsZCAo ZXEgKGNhciAocHl0aG9uLWluZGVudC1jb250ZXh0KSkgOmFmdGVyLWJsb2NrLXN0YXJ0KSkKQEAg LTExNzQsNiArMTE3NCwxMTggQEAgcHl0aG9uLWluZGVudC1pbnNpZGUtcGFyZW4tNwogICAgOzsg VGhpcyBzaWduYWxzIGFuIGVycm9yIGlmIHRoZSB0ZXN0IGZhaWxzCiAgICAoc2hvdWxkIChlcSAo Y2FyIChweXRob24taW5kZW50LWNvbnRleHQpKSA6aW5zaWRlLXBhcmVuLW5ld2xpbmUtc3RhcnQp KSkpCiAKKyhlcnQtZGVmdGVzdCBweXRob24taW5kZW50LWluc2lkZS1wYXJlbi1ibG9jay0xICgp CisgICJgcHl0aG9uLWluZGVudC1ibG9jay1wYXJlbi1kZWVwZXInIHNldCB0byBuaWwgKGRlZmF1 bHQpLgorU2VlIEJ1ZyM2MjY5Ni4iCisgIChweXRob24tdGVzdHMtd2l0aC10ZW1wLWJ1ZmZlcgor ICAgIgoraWYgKCdWQUxVRScgaW4gbXlfdW5uZWNlc3NhcmlseV9sb25nX2RpY3Rpb25hcnkgYW5k CisgICAgc29tZV9vdGhlcl9sb25nX2NvbmRpdGlvbl9jYXNlKToKKyAgICBkb19zb21ldGhpbmco KQorZWxpZiAoc29tZV9jYXNlIG9yCisgICAgICBhbm90aGVyX2Nhc2UpOgorICAgIGRvX2Fub3Ro ZXIoKQorIgorICAgKHB5dGhvbi10ZXN0cy1sb29rLWF0ICJpZiIpCisgICAoc2hvdWxkIChlcSAo Y2FyIChweXRob24taW5kZW50LWNvbnRleHQpKSA6bm8taW5kZW50KSkKKyAgIChzaG91bGQgKD0g KHB5dGhvbi1pbmRlbnQtY2FsY3VsYXRlLWluZGVudGF0aW9uKSAwKSkKKyAgIChmb3J3YXJkLWxp bmUgMSkKKyAgIChzaG91bGQgKGVxIChjYXIgKHB5dGhvbi1pbmRlbnQtY29udGV4dCkpIDppbnNp ZGUtcGFyZW4tZnJvbS1ibG9jaykpCisgICAoc2hvdWxkICg9IChweXRob24taW5kZW50LWNhbGN1 bGF0ZS1pbmRlbnRhdGlvbikgNCkpCisgICAoZm9yd2FyZC1saW5lIDEpCisgICAoc2hvdWxkIChl cSAoY2FyIChweXRob24taW5kZW50LWNvbnRleHQpKSA6YWZ0ZXItYmxvY2stc3RhcnQpKQorICAg KHNob3VsZCAoPSAocHl0aG9uLWluZGVudC1jYWxjdWxhdGUtaW5kZW50YXRpb24pIDQpKQorICAg KGZvcndhcmQtbGluZSAxKQorICAgKHNob3VsZCAoZXEgKGNhciAocHl0aG9uLWluZGVudC1jb250 ZXh0KSkgOmF0LWRlZGVudGVyLWJsb2NrLXN0YXJ0KSkKKyAgIChzaG91bGQgKD0gKHB5dGhvbi1p bmRlbnQtY2FsY3VsYXRlLWluZGVudGF0aW9uKSAwKSkKKyAgIChmb3J3YXJkLWxpbmUgMSkKKyAg IChzaG91bGQgKGVxIChjYXIgKHB5dGhvbi1pbmRlbnQtY29udGV4dCkpIDppbnNpZGUtcGFyZW4t ZnJvbS1ibG9jaykpCisgICAoc2hvdWxkICg9IChweXRob24taW5kZW50LWNhbGN1bGF0ZS1pbmRl bnRhdGlvbikgNikpCisgICAoZm9yd2FyZC1saW5lIDEpCisgICAoc2hvdWxkIChlcSAoY2FyIChw eXRob24taW5kZW50LWNvbnRleHQpKSA6YWZ0ZXItYmxvY2stc3RhcnQpKQorICAgKHNob3VsZCAo PSAocHl0aG9uLWluZGVudC1jYWxjdWxhdGUtaW5kZW50YXRpb24pIDQpKSkpCisKKyhlcnQtZGVm dGVzdCBweXRob24taW5kZW50LWluc2lkZS1wYXJlbi1ibG9jay0yICgpCisgICJgcHl0aG9uLWlu ZGVudC1ibG9jay1wYXJlbi1kZWVwZXInIHNldCB0byB0LgorU2VlIEJ1ZyM2MjY5Ni4iCisgIChw eXRob24tdGVzdHMtd2l0aC10ZW1wLWJ1ZmZlcgorICAgIgoraWYgKCdWQUxVRScgaW4gbXlfdW5u ZWNlc3NhcmlseV9sb25nX2RpY3Rpb25hcnkgYW5kCisgICAgICAgIHNvbWVfb3RoZXJfbG9uZ19j b25kaXRpb25fY2FzZSk6CisgICAgZG9fc29tZXRoaW5nKCkKK2VsaWYgKHNvbWVfY2FzZSBvcgor ICAgICAgYW5vdGhlcl9jYXNlKToKKyAgICBkb19hbm90aGVyKCkKKyIKKyAgIChsZXQgKChweXRo b24taW5kZW50LWJsb2NrLXBhcmVuLWRlZXBlciB0KSkKKyAgICAgKHB5dGhvbi10ZXN0cy1sb29r LWF0ICJpZiIpCisgICAgIChzaG91bGQgKGVxIChjYXIgKHB5dGhvbi1pbmRlbnQtY29udGV4dCkp IDpuby1pbmRlbnQpKQorICAgICAoc2hvdWxkICg9IChweXRob24taW5kZW50LWNhbGN1bGF0ZS1p bmRlbnRhdGlvbikgMCkpCisgICAgIChmb3J3YXJkLWxpbmUgMSkKKyAgICAgKHNob3VsZCAoZXEg KGNhciAocHl0aG9uLWluZGVudC1jb250ZXh0KSkgOmluc2lkZS1wYXJlbi1mcm9tLWJsb2NrKSkK KyAgICAgKHNob3VsZCAoPSAocHl0aG9uLWluZGVudC1jYWxjdWxhdGUtaW5kZW50YXRpb24pIDgp KQorICAgICAoZm9yd2FyZC1saW5lIDEpCisgICAgIChzaG91bGQgKGVxIChjYXIgKHB5dGhvbi1p bmRlbnQtY29udGV4dCkpIDphZnRlci1ibG9jay1zdGFydCkpCisgICAgIChzaG91bGQgKD0gKHB5 dGhvbi1pbmRlbnQtY2FsY3VsYXRlLWluZGVudGF0aW9uKSA0KSkKKyAgICAgKGZvcndhcmQtbGlu ZSAxKQorICAgICAoc2hvdWxkIChlcSAoY2FyIChweXRob24taW5kZW50LWNvbnRleHQpKSA6YXQt ZGVkZW50ZXItYmxvY2stc3RhcnQpKQorICAgICAoc2hvdWxkICg9IChweXRob24taW5kZW50LWNh bGN1bGF0ZS1pbmRlbnRhdGlvbikgMCkpCisgICAgIChmb3J3YXJkLWxpbmUgMSkKKyAgICAgKHNo b3VsZCAoZXEgKGNhciAocHl0aG9uLWluZGVudC1jb250ZXh0KSkgOmluc2lkZS1wYXJlbi1mcm9t LWJsb2NrKSkKKyAgICAgKHNob3VsZCAoPSAocHl0aG9uLWluZGVudC1jYWxjdWxhdGUtaW5kZW50 YXRpb24pIDYpKQorICAgICAoZm9yd2FyZC1saW5lIDEpCisgICAgIChzaG91bGQgKGVxIChjYXIg KHB5dGhvbi1pbmRlbnQtY29udGV4dCkpIDphZnRlci1ibG9jay1zdGFydCkpCisgICAgIChzaG91 bGQgKD0gKHB5dGhvbi1pbmRlbnQtY2FsY3VsYXRlLWluZGVudGF0aW9uKSA0KSkpKSkKKworKGVy dC1kZWZ0ZXN0IHB5dGhvbi1pbmRlbnQtaW5zaWRlLXBhcmVuLWJsb2NrLTMgKCkKKyAgIldpdGgg YmFja3NsYXNoLiAgYHB5dGhvbi1pbmRlbnQtYmxvY2stcGFyZW4tZGVlcGVyJyBzZXQgdG8gbmls IChkZWZhdWx0KS4KK1NlZSBCdWcjNjI2OTYuIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1i dWZmZXIKKyAgICIKK2lmICdWQUxVRScgaW4gbXlfdW5jZXNzYXJpbHlfbG9uZ19kaWN0aW9uYXJ5 IGFuZFxcCisgICAoc29tZV9vdGhlcl9sb25nX2NvbmRpdGlvbl9jYXNlIG9yCisgICAgYW5vdGhl cl9jYXNlKToKKyAgICBkb19zb21ldGhpbmcoKQorIgorICAgKHB5dGhvbi10ZXN0cy1sb29rLWF0 ICJpZiIpCisgICAoc2hvdWxkIChlcSAoY2FyIChweXRob24taW5kZW50LWNvbnRleHQpKSA6bm8t aW5kZW50KSkKKyAgIChzaG91bGQgKD0gKHB5dGhvbi1pbmRlbnQtY2FsY3VsYXRlLWluZGVudGF0 aW9uKSAwKSkKKyAgIChmb3J3YXJkLWxpbmUgMSkKKyAgIChzaG91bGQgKGVxIChjYXIgKHB5dGhv bi1pbmRlbnQtY29udGV4dCkpCisgICAgICAgICAgICAgICA6YWZ0ZXItYmFja3NsYXNoLWJsb2Nr LWNvbnRpbnVhdGlvbikpCisgICAoc2hvdWxkICg9IChweXRob24taW5kZW50LWNhbGN1bGF0ZS1p bmRlbnRhdGlvbikgMykpCisgICAoZm9yd2FyZC1saW5lIDEpCisgICAoc2hvdWxkIChlcSAoY2Fy IChweXRob24taW5kZW50LWNvbnRleHQpKSA6aW5zaWRlLXBhcmVuLWZyb20tYmxvY2spKQorICAg KHNob3VsZCAoPSAocHl0aG9uLWluZGVudC1jYWxjdWxhdGUtaW5kZW50YXRpb24pIDQpKQorICAg KGZvcndhcmQtbGluZSAxKQorICAgKHNob3VsZCAoZXEgKGNhciAocHl0aG9uLWluZGVudC1jb250 ZXh0KSkgOmFmdGVyLWJsb2NrLXN0YXJ0KSkKKyAgIChzaG91bGQgKD0gKHB5dGhvbi1pbmRlbnQt Y2FsY3VsYXRlLWluZGVudGF0aW9uKSA0KSkpKQorCisoZXJ0LWRlZnRlc3QgcHl0aG9uLWluZGVu dC1pbnNpZGUtcGFyZW4tYmxvY2stNCAoKQorICAiV2l0aCBiYWNrc2xhc2guICBgcHl0aG9uLWlu ZGVudC1ibG9jay1wYXJlbi1kZWVwZXInIHNldCB0byB0LgorU2VlIEJ1ZyM2MjY5Ni4iCisgIChw eXRob24tdGVzdHMtd2l0aC10ZW1wLWJ1ZmZlcgorICAgIgoraWYgJ1ZBTFVFJyBpbiBteV91bmNl c3NhcmlseV9sb25nX2RpY3Rpb25hcnkgYW5kXFwKKyAgIChzb21lX290aGVyX2xvbmdfY29uZGl0 aW9uX2Nhc2Ugb3IKKyAgICAgICAgYW5vdGhlcl9jYXNlKToKKyAgICBkb19zb21ldGhpbmcoKQor IgorICAgKGxldCAoKHB5dGhvbi1pbmRlbnQtYmxvY2stcGFyZW4tZGVlcGVyIHQpKQorICAgICAo cHl0aG9uLXRlc3RzLWxvb2stYXQgImlmIikKKyAgICAgKHNob3VsZCAoZXEgKGNhciAocHl0aG9u LWluZGVudC1jb250ZXh0KSkgOm5vLWluZGVudCkpCisgICAgIChzaG91bGQgKD0gKHB5dGhvbi1p bmRlbnQtY2FsY3VsYXRlLWluZGVudGF0aW9uKSAwKSkKKyAgICAgKGZvcndhcmQtbGluZSAxKQor ICAgICAoc2hvdWxkIChlcSAoY2FyIChweXRob24taW5kZW50LWNvbnRleHQpKQorICAgICAgICAg ICAgICAgICA6YWZ0ZXItYmFja3NsYXNoLWJsb2NrLWNvbnRpbnVhdGlvbikpCisgICAgIChzaG91 bGQgKD0gKHB5dGhvbi1pbmRlbnQtY2FsY3VsYXRlLWluZGVudGF0aW9uKSAzKSkKKyAgICAgKGZv cndhcmQtbGluZSAxKQorICAgICAoc2hvdWxkIChlcSAoY2FyIChweXRob24taW5kZW50LWNvbnRl eHQpKSA6aW5zaWRlLXBhcmVuLWZyb20tYmxvY2spKQorICAgICAoc2hvdWxkICg9IChweXRob24t aW5kZW50LWNhbGN1bGF0ZS1pbmRlbnRhdGlvbikgOCkpCisgICAgIChmb3J3YXJkLWxpbmUgMSkK KyAgICAgKHNob3VsZCAoZXEgKGNhciAocHl0aG9uLWluZGVudC1jb250ZXh0KSkgOmFmdGVyLWJs b2NrLXN0YXJ0KSkKKyAgICAgKHNob3VsZCAoPSAocHl0aG9uLWluZGVudC1jYWxjdWxhdGUtaW5k ZW50YXRpb24pIDQpKSkpKQorCiAoZXJ0LWRlZnRlc3QgcHl0aG9uLWluZGVudC1hZnRlci1ibG9j ay0xICgpCiAgICJUaGUgbW9zdCBzaW1wbGUgYWZ0ZXItYmxvY2sgY2FzZSB0aGF0IHNob3VsZG4n dCBmYWlsLiIKICAgKHB5dGhvbi10ZXN0cy13aXRoLXRlbXAtYnVmZmVyCkBAIC0xNjcwLDcgKzE3 ODIsNyBAQCBweXRob24taW5kZW50LWRlZGVudGVycy04CiAgICAoc2hvdWxkICg9IChweXRob24t aW5kZW50LWNhbGN1bGF0ZS1pbmRlbnRhdGlvbikgMCkpCiAgICAoc2hvdWxkICg9IChweXRob24t aW5kZW50LWNhbGN1bGF0ZS1pbmRlbnRhdGlvbiB0KSAwKSkKICAgIChweXRob24tdGVzdHMtbG9v ay1hdCAiYSA9PSA0KTpcbiIpCi0gICAoc2hvdWxkIChlcSAoY2FyIChweXRob24taW5kZW50LWNv bnRleHQpKSA6aW5zaWRlLXBhcmVuKSkKKyAgIChzaG91bGQgKGVxIChjYXIgKHB5dGhvbi1pbmRl bnQtY29udGV4dCkpIDppbnNpZGUtcGFyZW4tZnJvbS1ibG9jaykpCiAgICAoc2hvdWxkICg9IChw eXRob24taW5kZW50LWNhbGN1bGF0ZS1pbmRlbnRhdGlvbikgNikpCiAgICAocHl0aG9uLWluZGVu dC1saW5lKQogICAgKHNob3VsZCAoPSAocHl0aG9uLWluZGVudC1jYWxjdWxhdGUtaW5kZW50YXRp b24gdCkgNCkpCi0tIAoyLjI1LjEKCg== --000000000000cb6d6a05f90d8fff--