From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18836 invoked by alias); 14 Aug 2014 13:53:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 18826 invoked by uid 89); 14 Aug 2014 13:53:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f50.google.com Received: from mail-oi0-f50.google.com (HELO mail-oi0-f50.google.com) (209.85.218.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 14 Aug 2014 13:53:05 +0000 Received: by mail-oi0-f50.google.com with SMTP id a141so733441oig.23 for ; Thu, 14 Aug 2014 06:53:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc :content-type; bh=BSfshP3KbcISicHYqz0/6C4LBqQ/fp4KX+BN6mwMHs0=; b=WYUec6+hXjqwdVwHK/it+A2XOlAsY3F17EWJK74SZTUM/UCMJjRIx5goRlNSI1J+Rf HPOHFVPlWhw9XIaRRSKH37CVWIObJ+eLfVe2100gsnxo88CfNXblRJXuFd2ZFfJhuckc SYRV7TJ0hsAeLv2jjCQKoX7hEpps5ZSrAdyACmgnXkI1WyoDN3Me4XPyxlbZV22oC35e HH5j72HRhay4HNK8PMmtCkqqk7+0atB8pd+XK34SEBqLdqjiZR6IUgUyu2Snk43+xeCy pP87TERqLqgwpO1UaMfMw95LjXcGy6azImOk1rHgKquK4FkKnxdCzIq7pULIog7dsTiu CYVA== X-Gm-Message-State: ALoCoQnTnZUjFqdoG+bet+6rAAR9pP1odGvEC9MIs3Np7hWMGDYBxqY/wJNRw55aomd+NRk6NdRM MIME-Version: 1.0 X-Received: by 10.60.176.104 with SMTP id ch8mr12904649oec.64.1408024383468; Thu, 14 Aug 2014 06:53:03 -0700 (PDT) Received: by 10.202.12.193 with HTTP; Thu, 14 Aug 2014 06:53:03 -0700 (PDT) Date: Thu, 14 Aug 2014 13:53:00 -0000 Message-ID: Subject: [PATCH v2] Fix xmethod Python so that it works with Python 3 From: Siva Chandra To: gdb-patches Cc: Doug Evans Content-Type: multipart/mixed; boundary=089e01183138365fbe05009739ea X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg00251.txt.bz2 --089e01183138365fbe05009739ea Content-Type: text/plain; charset=UTF-8 Content-length: 805 The attached patch fixes the "no space before parenthesis in Python" comment by Joel. The comment was for the changes in the test suite. Going by examples, I thought the test case code (but not the .exp files) did not require adherence to coding style. I also agree with Joel that this patch should also pushed to the 7.8 branch. ChangeLog: 2014-08-14 Siva Chandra Reddy gdb/ * python/lib/gdb/command/xmethods.py (set_xm_status1): Use the 'items' methods instead of 'iteritems' method on dictionaries. gdb/testsuite/ * gdb.python/py-xmethods.py (A_getarrayind) (E_method_char_worker.__call__, E_method_int_worker.__call__): Use 'print' with function call syntax. (E_method_matcher.match): Fix tab vs space indentation mixup. --089e01183138365fbe05009739ea Content-Type: text/plain; charset=US-ASCII; name="fix_xmethods_for_python3_v2.txt" Content-Disposition: attachment; filename="fix_xmethods_for_python3_v2.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hyu5a6b80 Content-length: 4262 ZGlmZiAtLWdpdCBhL2dkYi9weXRob24vbGliL2dkYi9jb21tYW5kL3htZXRo b2RzLnB5IGIvZ2RiL3B5dGhvbi9saWIvZ2RiL2NvbW1hbmQveG1ldGhvZHMu cHkKaW5kZXggNTVjYzgxZi4uMjA2MzEzZSAxMDA2NDQKLS0tIGEvZ2RiL3B5 dGhvbi9saWIvZ2RiL2NvbW1hbmQveG1ldGhvZHMucHkKKysrIGIvZ2RiL3B5 dGhvbi9saWIvZ2RiL2NvbW1hbmQveG1ldGhvZHMucHkKQEAgLTE0MCw3ICsx NDAsNyBAQCBkZWYgcHJpbnRfeG1faW5mbyh4bV9kaWN0LCBuYW1lX3JlKToK IAogZGVmIHNldF94bV9zdGF0dXMxKHhtX2RpY3QsIG5hbWVfcmUsIHN0YXR1 cyk6CiAgICAgIiIiU2V0IHRoZSBzdGF0dXMgKGVuYWJsZWQvZGlzYWJsZWQp IG9mIGEgZGljdGlvbmFyeSBvZiB4bWV0aG9kcy4iIiIKLSAgICBmb3IgbG9j dXNfc3RyLCBtYXRjaGVycyBpbiB4bV9kaWN0Lml0ZXJpdGVtcygpOgorICAg IGZvciBsb2N1c19zdHIsIG1hdGNoZXJzIGluIHhtX2RpY3QuaXRlbXMoKToK ICAgICAgICAgZm9yIG1hdGNoZXIgaW4gbWF0Y2hlcnM6CiAgICAgICAgICAg ICBpZiBub3QgbmFtZV9yZToKICAgICAgICAgICAgICAgICAjIElmIHRoZSBu YW1lIHJlZ2V4IGlzIG1pc3NpbmcsIHRoZW4gc2V0IHRoZSBzdGF0dXMgb2Yg dGhlCmRpZmYgLS1naXQgYS9nZGIvdGVzdHN1aXRlL2dkYi5weXRob24vcHkt eG1ldGhvZHMucHkgYi9nZGIvdGVzdHN1aXRlL2dkYi5weXRob24vcHkteG1l dGhvZHMucHkKaW5kZXggNmZlY2YyYi4uNDdmYjAwYiAxMDA2NDQKLS0tIGEv Z2RiL3Rlc3RzdWl0ZS9nZGIucHl0aG9uL3B5LXhtZXRob2RzLnB5CisrKyBi L2dkYi90ZXN0c3VpdGUvZ2RiLnB5dGhvbi9weS14bWV0aG9kcy5weQpAQCAt MjUsMjIgKzI1LDIyIEBAIGZyb20gZ2RiLnhtZXRob2QgaW1wb3J0IFNpbXBs ZVhNZXRob2RNYXRjaGVyCiAKIAogZGVmIEFfcGx1c19BKG9iaiwgb3ByKToK LSAgcHJpbnQgKCdGcm9tIFB5dGhvbiA8QV9wbHVzX0E+OicpCisgIHByaW50 KCdGcm9tIFB5dGhvbiA8QV9wbHVzX0E+OicpCiAgIHJldHVybiBvYmpbJ2En XSArIG9wclsnYSddCiAKIAogZGVmIHBsdXNfcGx1c19BKG9iaik6Ci0gIHBy aW50ICgnRnJvbSBQeXRob24gPHBsdXNfcGx1c19BPjonKQorICBwcmludCgn RnJvbSBQeXRob24gPHBsdXNfcGx1c19BPjonKQogICByZXR1cm4gb2JqWydh J10gKyAxCiAKIAogZGVmIEFfZ2V0YShvYmopOgotICBwcmludCAoJ0Zyb20g UHl0aG9uIDxBX2dldGE+OicpCisgIHByaW50KCdGcm9tIFB5dGhvbiA8QV9n ZXRhPjonKQogICByZXR1cm4gb2JqWydhJ10KIAogCiBkZWYgQV9nZXRhcnJh eWluZChvYmosIGluZGV4KToKLSAgcHJpbnQgJ0Zyb20gUHl0aG9uIDxBX2dl dGFycmF5aW5kPjonCisgIHByaW50KCdGcm9tIFB5dGhvbiA8QV9nZXRhcnJh eWluZD46JykKICAgcmV0dXJuIG9ialsnYXJyYXknXVtpbmRleF0KIAogCkBA IC02MSw3ICs2MSw3IEBAIGNsYXNzIEVfbWV0aG9kX2NoYXJfd29ya2VyKFhN ZXRob2RXb3JrZXIpOgogICAgICAgICByZXR1cm4gZ2RiLmxvb2t1cF90eXBl KCdjaGFyJykKIAogICAgIGRlZiBfX2NhbGxfXyhzZWxmLCBvYmosIGFyZyk6 Ci0gICAgICAgIHByaW50ICdGcm9tIFB5dGhvbiA8RV9tZXRob2RfY2hhcj4n CisgICAgICAgIHByaW50KCdGcm9tIFB5dGhvbiA8RV9tZXRob2RfY2hhcj4n KQogICAgICAgICByZXR1cm4gTm9uZQogCiAKQEAgLTczLDcgKzczLDcgQEAg Y2xhc3MgRV9tZXRob2RfaW50X3dvcmtlcihYTWV0aG9kV29ya2VyKToKICAg ICAgICAgcmV0dXJuIGdkYi5sb29rdXBfdHlwZSgnaW50JykKIAogICAgIGRl ZiBfX2NhbGxfXyhzZWxmLCBvYmosIGFyZyk6Ci0gICAgICAgIHByaW50ICdG cm9tIFB5dGhvbiA8RV9tZXRob2RfaW50PicKKyAgICAgICAgcHJpbnQoJ0Zy b20gUHl0aG9uIDxFX21ldGhvZF9pbnQ+JykKICAgICAgICAgcmV0dXJuIE5v bmUKIAogCkBAIC04Niw3ICs4Niw3IEBAIGNsYXNzIEVfbWV0aG9kX21hdGNo ZXIoWE1ldGhvZE1hdGNoZXIpOgogICAgICAgICBjbGFzc190YWcgPSBjbGFz c190eXBlLnVucXVhbGlmaWVkKCkudGFnCiAgICAgICAgIGlmIG5vdCByZS5t YXRjaCgnXmRvcDo6RSQnLCBjbGFzc190YWcpOgogICAgICAgICAgICAgcmV0 dXJuIE5vbmUKLQlpZiBub3QgcmUubWF0Y2goJ15tZXRob2QkJywgbWV0aG9k X25hbWUpOgorICAgICAgICBpZiBub3QgcmUubWF0Y2goJ15tZXRob2QkJywg bWV0aG9kX25hbWUpOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKICAgICAg ICAgd29ya2VycyA9IFtdCiAgICAgICAgIGlmIHNlbGYubWV0aG9kc1swXS5l bmFibGVkOgpAQCAtMTA5LDcgKzEwOSw3IEBAIGNsYXNzIEdfc2l6ZV9kaWZm X3dvcmtlcihYTWV0aG9kV29ya2VyKToKICAgICAgICAgcGFzcwogCiAgICAg ZGVmIF9fY2FsbF9fKHNlbGYsIG9iaik6Ci0gICAgICAgIHByaW50ICgnRnJv bSBQeXRob24gRzw+OjpzaXplX2RpZmYoKScpCisgICAgICAgIHByaW50KCdG cm9tIFB5dGhvbiBHPD46OnNpemVfZGlmZigpJykKICAgICAgICAgcmV0dXJu IChzZWxmLl9tZXRob2RfdGVtcGxhdGVfdHlwZS5zaXplb2YgLQogICAgICAg ICAgICAgICAgIHNlbGYuX2NsYXNzX3RlbXBsYXRlX3R5cGUuc2l6ZW9mKQog CkBAIC0xMjMsNyArMTIzLDcgQEAgY2xhc3MgR19zaXplX211bF93b3JrZXIo WE1ldGhvZFdvcmtlcik6CiAgICAgICAgIHBhc3MKIAogICAgIGRlZiBfX2Nh bGxfXyhzZWxmLCBvYmopOgotICAgICAgICBwcmludCAoJ0Zyb20gUHl0aG9u IEc8Pjo6c2l6ZV9tdWwoKScpCisgICAgICAgIHByaW50KCdGcm9tIFB5dGhv biBHPD46OnNpemVfbXVsKCknKQogICAgICAgICByZXR1cm4gc2VsZi5fY2xh c3NfdGVtcGxhdGVfdHlwZS5zaXplb2YgKiBzZWxmLl9tZXRob2RfdGVtcGxh dGVfdmFsCiAKIApAQCAtMTM2LDcgKzEzNiw3IEBAIGNsYXNzIEdfbXVsX3dv cmtlcihYTWV0aG9kV29ya2VyKToKICAgICAgICAgcmV0dXJuIHNlbGYuX21l dGhvZF90ZW1wbGF0ZV90eXBlCiAKICAgICBkZWYgX19jYWxsX18oc2VsZiwg b2JqLCBhcmcpOgotICAgICAgICBwcmludCAoJ0Zyb20gUHl0aG9uIEc8Pjo6 bXVsKCknKQorICAgICAgICBwcmludCgnRnJvbSBQeXRob24gRzw+OjptdWwo KScpCiAgICAgICAgIHJldHVybiBvYmpbJ3QnXSAqIGFyZwogCiAK --089e01183138365fbe05009739ea--