[PATCH] Modernize language/python/srq*
Matthias Geiger <[email protected]> Mon, 30 Mar 2026 09:00:49 +0200
| Newsgroups | gmane.linux.hardware.gpib.general |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --------------2FWK14R7wtgV0Xavw4AR2k6g Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi, attached is a patch that modernizes the examples under language/python. Nothing was changed code-wise except to add a function definition for the last few lines. Apart from that I mostly intended the code and formatted it, and fixed the print( statements for python3. -- Freundliche Grüsse / Best regards Matthias Geiger __________________________________________________________________ Matthias Geiger Werkstudent Forschung & Entwicklung/Research & Development Phone : +49-6441-609-3004 Email : [email protected] URL : www.wiwa.de WIWA Wilhelm Wagner GmbH & Co. KG Gewerbestrasse 1-3, 35633 Lahnau, Germany Besucheranschrift/visitor address: Georg-Ohm-Strasse 12, 35633 Lahnau, Germany AG WETZLAR HRA 3223, Komplementär : Wagner GmbH (AG Wetzlar HRB 363) UST-ID Nr: / VAT-No: DE113745802 Geschäftsführer: Dipl.-Ing. (FH) Peter Turczak, Dipl.-Wirt.-Ing. Malte Weber --------------2FWK14R7wtgV0Xavw4AR2k6g Content-Type: text/x-patch; charset=UTF-8; name="0001-language-python-srq_device-Modernize-for-python3-fix.patch" Content-Disposition: attachment; filename*0="0001-language-python-srq_device-Modernize-for-python3-fix.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA3YzQ0NDJlMDNlZTM1MTAxYmExZTY3OGNlNGRhZWMzYjY2YTFjZjhlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGlhcyBHZWlnZXIgPHdlcmRhaGlhc0BkZWJp YW4ub3JnPgpEYXRlOiBNb24sIDMwIE1hciAyMDI2IDA4OjU1OjE3ICswMjAwClN1YmplY3Q6 IGxhbmd1YWdlL3B5dGhvbi9zcnFfZGV2aWNlOiBNb2Rlcm5pemUgZm9yIHB5dGhvbjMsIGZp eCBpbmRlbmRhdGlvbgoKQWRkaXRpb25hbGx5LCBmaXggd2hpdGVzcGFjZSBlcnJvcnMKClNp Z25lZC1vZmYtYnk6IE1hdHRoaWFzIEdlaWdlciA8d2VyZGFoaWFzQGRlYmlhbi5vcmc+Ci0t LQogbGludXgtZ3BpYi11c2VyL2xhbmd1YWdlL3B5dGhvbi9zcnFfYm9hcmQucHkgIHwgNzQg KysrKysrKysrKy0tLS0tLS0tLQogbGludXgtZ3BpYi11c2VyL2xhbmd1YWdlL3B5dGhvbi9z cnFfZGV2aWNlLnB5IHwgNjkgKysrKysrKystLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg NzUgaW5zZXJ0aW9ucygrKSwgNjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGludXgt Z3BpYi11c2VyL2xhbmd1YWdlL3B5dGhvbi9zcnFfYm9hcmQucHkgYi9saW51eC1ncGliLXVz ZXIvbGFuZ3VhZ2UvcHl0aG9uL3NycV9ib2FyZC5weQppbmRleCAzNmZjNGMxYS4uNTBlMzg0 MjUgMTAwNjQ0Ci0tLSBhL2xpbnV4LWdwaWItdXNlci9sYW5ndWFnZS9weXRob24vc3JxX2Jv YXJkLnB5CisrKyBiL2xpbnV4LWdwaWItdXNlci9sYW5ndWFnZS9weXRob24vc3JxX2JvYXJk LnB5CkBAIC0xLDQ2ICsxLDUwIEBACi1pbXBvcnQgc3lzCi1zeXMucGF0aC5hcHBlbmQoJy91 c3IvbG9jYWwvbGliNjQvcHl0aG9uMy45L3NpdGUtcGFja2FnZXMnKQogaW1wb3J0IGdwaWIK IAotYm9hcmQgID0gMQorYm9hcmQgPSAxCiBkZXZpY2UgPSAxCiAKKwogZGVmIHF1ZXJ5KGhh bmRsZSwgY29tbWFuZCwgbnVtYnl0ZXM9MTAwKToKLSAgICAgICAgZ3BpYi53cml0ZShoYW5k bGUsY29tbWFuZCkKLSAgICAgICAgcmVzcG9uc2UgPSBncGliLnJlYWQoaGFuZGxlLG51bWJ5 dGVzKQotICAgICAgICByZXNwb25zZSA9IHJlc3BvbnNlLnJzdHJpcCgiXHJcbiIpCi0gICAg ICAgIHJldHVybiByZXNwb25zZQorICAgIGdwaWIud3JpdGUoaGFuZGxlLCBjb21tYW5kKQor ICAgIHJlc3BvbnNlID0gZ3BpYi5yZWFkKGhhbmRsZSwgbnVtYnl0ZXMpCisgICAgcmVzcG9u c2UgPSByZXNwb25zZS5yc3RyaXAoIlxyXG4iKQorICAgIHJldHVybiByZXNwb25zZQorCiAK IGRlZiBpbml0aWFsaXNlX2RldmljZShoYW5kbGUpOiAgICAgICAgICAgICMgc2V0IHVwIGRl dmljZSB0byBhc3NlcnQgU1JRL1JRUwotICAgICAgICBncGliLndyaXRlKGhhbmRsZSwiKkNM UyIpICAgICAgICAgIyBDbGVhciBzdGF0dXMgcmVnaXN0ZXJzCi0gICAgICAgIGdwaWIud3Jp dGUoaGFuZGxlLCIqU1JFIDMyIikgICAgICAjIEFzc2VydCBTUlEgb24gT1BDCi0gICAgICAg IHJldHVybgorICAgIGdwaWIud3JpdGUoaGFuZGxlLCAiKkNMUyIpICAgICAgICAgIyBDbGVh ciBzdGF0dXMgcmVnaXN0ZXJzCisgICAgZ3BpYi53cml0ZShoYW5kbGUsICIqU1JFIDMyIikg ICAgICAjIEFzc2VydCBTUlEgb24gT1BDCisgICAgcmV0dXJuCisKIAogZGVmIHNob3dfZGV2 aWQoaGFuZGxlKTogICAgICAgICAgICAgICAgICAgIyBTaG93IGRldmljZSBJRAotICAgICAg ICBwcmludCBxdWVyeShoYW5kbGUsIipJRE4/IikgICAgICAKLSAgICAgICAgcmV0dXJuCi0K LXByaW50IGdwaWIudmVyc2lvbigpICAgICAgICAgICAgICAgICAgICAgICMgU2hvdyBwYWNr YWdlIHZlcnNpb24KLXVkID0gZ3BpYi5kZXYoYm9hcmQsZGV2aWNlKSAgICAgICAgICAgICAg ICMgT3BlbiB0aGUgZGV2aWNlCi1ncGliLmNvbmZpZyhib2FyZCxncGliLkliY1RNTywgZ3Bp Yi5UMzBzKSAjIFNldCB0aW1lb3V0IHRvIDMwIHNlY29uZHMKLXNob3dfZGV2aWQodWQpOwot aW5pdGlhbGlzZV9kZXZpY2UodWQpOwotZ3BpYi53cml0ZShoYW5kbGUsIipUU1Q7Kk9QQyIp ICAgICAgICAgICAgIyBJbml0aWF0ZSBzZWxmdGVzdCBhbmQgcmVxdWVzdCBPUEMKLSMgV2Fp dCBmb3IgVGltZW91dCBvciBTZXJ2aWNlIFJlcXVlc3Qgb24gYm9hcmQKLXN0YSA9IGdwaWIu d2FpdChib2FyZCwgZ3BpYi5USU1PIHwgZ3BpYi5TUlFJKQotaWYgKHN0YSAmIGdwaWIuVElN TykgIT0gMDoKLSAgIHByaW50ICJUaW1lZCBvdXQiCi1lbHNlOgotICBwcmludCAiU1JRIGFz c2VydGVkICIKLSMgRm9yIGVhY2ggZGV2aWNlIHdoaWNoIG1pZ2h0IHB1bGwgU1JRCi0gIHN0 YiA9IGdwaWIuc2VyaWFsX3BvbGwodWQpICAgICAgICAgICAgIyBSZWFkIHN0YXR1cyBieXRl Ci0gIHByaW50ICJzdGIgPSAlI3giJShzdGIpCi0gIGlmIChzdGIgJiBncGliLkliU3RiUlFT KSAhPSAwOiAgICAgICAgIyBDaGVjayBmb3IgUlFTIGJpdAotICAgIHByaW50ICJEZXZpY2Ug YXNzZXJ0ZWQgUlFTIgorICAgIHByaW50KHF1ZXJ5KGhhbmRsZSwgIipJRE4/IikpCisgICAg cmV0dXJuCisKKworZGVmIHNlbGZ0dGVzdChoYW5kbGUsIGJvYXJkLCBkZXZpdmUpOgorCisg ICAgcHJpbnQoZ3BpYi52ZXJzaW9uKCkpICAgICAgICAgICAgICAgICAgICAgIyBTaG93IHBh Y2thZ2UgdmVyc2lvbgorICAgIHVkID0gZ3BpYi5kZXYoYm9hcmQsIGRldmljZSkgICAgICAg ICAgICAgICAjIE9wZW4gdGhlIGRldmljZQorICAgIGdwaWIuY29uZmlnKGJvYXJkLCBncGli LkliY1RNTywgZ3BpYi5UMzBzKSAgIyBTZXQgdGltZW91dCB0byAzMCBzZWNvbmRzCisgICAg c2hvd19kZXZpZCh1ZCkKKyAgICBpbml0aWFsaXNlX2RldmljZSh1ZCkKKyAgICBncGliLndy aXRlKGhhbmRsZSwgIipUU1Q7Kk9QQyIpICAgICAgICAgICAgIyBJbml0aWF0ZSBzZWxmdGVz dCBhbmQgcmVxdWVzdCBPUEMKKyAgICAjIFdhaXQgZm9yIFRpbWVvdXQgb3IgU2VydmljZSBS ZXF1ZXN0IG9uIGJvYXJkCisgICAgc3RhID0gZ3BpYi53YWl0KGJvYXJkLCBncGliLlRJTU8g fCBncGliLlNSUUkpCisgICAgaWYgKHN0YSAmIGdwaWIuVElNTykgIT0gMDoKKyAgICAgICAg cHJpbnQoIlRpbWVkIG91dCIpCisgICAgZWxzZToKKyAgICAgICAgcHJpbnQoIlNSUSBhc3Nl cnRlZCIpCisgICAgIyBGb3IgZWFjaCBkZXZpY2Ugd2hpY2ggbWlnaHQgcHVsbCBTUlEKKyAg ICBzdGIgPSBncGliLnNlcmlhbF9wb2xsKHVkKSAgICAgICAgICAgICMgUmVhZCBzdGF0dXMg Ynl0ZQorICAgIHByaW50KCJzdGIgPSAlI3giICUgKHN0YikpCisgICAgaWYgKHN0YiAmIGdw aWIuSWJTdGJSUVMpICE9IDA6ICAgICAgICAjIENoZWNrIGZvciBSUVMgYml0CisgICAgICAg IHByaW50KCJEZXZpY2UgYXNzZXJ0ZWQgUlFTIikKICAgICBpZiAoc3RiICYgZ3BpYi5JYlN0 YkVTQikgIT0gMDogICAgICAjIENoZWNrIGZvciBFdmVudCBTdGF0dXMgYml0Ci0gICAgICAg ICAgICBlc3IgPSBpbnQocXVlcnkodWQsIkVTUj8iKSkgIyBSZWFkIEV2ZW50IFN0YXR1cyBS ZWdpc3RlcgotICAgICAgICAgICAgaWYgKGVzciAmIDEpICE9IDA6ICAgICAgICAgICMgQ2hl Y2sgZm9yIG9wZXJhdGlvbiBjb21wbGV0ZWQKLSAgICAgICAgICAgICAgICAgICAgcHJpbnQg IkRldmljZSBPcGVyYXRpb24gQ29tcGxldGVkIgorICAgICAgICBlc3IgPSBpbnQocXVlcnko dWQsICJFU1I/IikpICAjIFJlYWQgRXZlbnQgU3RhdHVzIFJlZ2lzdGVyCisgICAgaWYgKGVz ciAmIDEpICE9IDA6ICAgICAgICAgICMgQ2hlY2sgZm9yIG9wZXJhdGlvbiBjb21wbGV0ZWQK KyAgICAgICAgcHJpbnQoIkRldmljZSBPcGVyYXRpb24gQ29tcGxldGVkIikKIAotIyBkb25l ICAKLWdwaWIuY2xvc2UodWQpCisgICAgIyBkb25lCisgICAgZ3BpYi5jbG9zZSh1ZCkKZGlm ZiAtLWdpdCBhL2xpbnV4LWdwaWItdXNlci9sYW5ndWFnZS9weXRob24vc3JxX2RldmljZS5w eSBiL2xpbnV4LWdwaWItdXNlci9sYW5ndWFnZS9weXRob24vc3JxX2RldmljZS5weQppbmRl eCA1MDRkMzlhYy4uZTJhOTAzNjggMTAwNjQ0Ci0tLSBhL2xpbnV4LWdwaWItdXNlci9sYW5n dWFnZS9weXRob24vc3JxX2RldmljZS5weQorKysgYi9saW51eC1ncGliLXVzZXIvbGFuZ3Vh Z2UvcHl0aG9uL3NycV9kZXZpY2UucHkKQEAgLTEsNDQgKzEsNDcgQEAKLWltcG9ydCBzeXMK LXN5cy5wYXRoLmFwcGVuZCgnL3Vzci9sb2NhbC9saWI2NC9weXRob24zLjkvc2l0ZS1wYWNr YWdlcycpCiBpbXBvcnQgZ3BpYgogCi1ib2FyZCAgPSAxCitib2FyZCA9IDEKIGRldmljZSA9 IDEKIAorCiBkZWYgcXVlcnkoaGFuZGxlLCBjb21tYW5kLCBudW1ieXRlcz0xMDApOgotICAg ICAgICBncGliLndyaXRlKGhhbmRsZSxjb21tYW5kKQotICAgICAgICByZXNwb25zZSA9IGdw aWIucmVhZChoYW5kbGUsbnVtYnl0ZXMpCi0gICAgICAgIHJlc3BvbnNlID0gcmVzcG9uc2Uu cnN0cmlwKCJcclxuIikKLSAgICAgICAgcmV0dXJuIHJlc3BvbnNlCisgICAgZ3BpYi53cml0 ZShoYW5kbGUsIGNvbW1hbmQpCisgICAgcmVzcG9uc2UgPSBncGliLnJlYWQoaGFuZGxlLCBu dW1ieXRlcykKKyAgICByZXNwb25zZSA9IHJlc3BvbnNlLnJzdHJpcCgiXHJcbiIpCisgICAg cmV0dXJuIHJlc3BvbnNlCisKIAogZGVmIGluaXRpYWxpc2VfZGV2aWNlKGhhbmRsZSk6ICAg ICAgICAgIyBzZXQgdXAgZGV2aWNlIHRvIGFzc2VydCBTUlEvUlFTCi0gICAgICAgIGdwaWIu d3JpdGUoaGFuZGxlLCIqQ0xTIikgICAgICAjIENsZWFyIHN0YXR1cyByZWdpc3RlcnMKLSAg ICAgICAgZ3BpYi53cml0ZShoYW5kbGUsIipTUkUgMzIiKSAgICMgQXNzZXJ0IFNSUSBvbiBF dmVudAotICAgICAgICByZXR1cm4KKyAgICBncGliLndyaXRlKGhhbmRsZSwgIipDTFMiKSAg ICAgICMgQ2xlYXIgc3RhdHVzIHJlZ2lzdGVycworICAgIGdwaWIud3JpdGUoaGFuZGxlLCAi KlNSRSAzMiIpICAgIyBBc3NlcnQgU1JRIG9uIEV2ZW50CisgICAgcmV0dXJuCisKIAogZGVm IHNob3dfZGV2aWQoaGFuZGxlKTogICAgICAgICAgICAgICAgIyBTaG93IGRldmljZSBJRAot ICAgICAgICBwcmludCBxdWVyeShoYW5kbGUsIipJRE4/IikgICAgICAKLSAgICAgICAgcmV0 dXJuCi0KLXByaW50IGdwaWIudmVyc2lvbigpICAgICAgICAgICAgICAgICAgICMgU2hvdyBw YWNrYWdlIHZlcnNpb24KLXVkID0gZ3BpYi5kZXYoYm9hcmQsZGV2aWNlKSAgICAgICAgICAg ICMgT3BlbiB0aGUgZGV2aWNlCi1ncGliLmNvbmZpZyhib2FyZCxncGliLkliY0FVVE9QT0xM LDEpICAjIEVuYWJsZSBhdXRvbWF0aWMgc2VyaWFsIHBvbGxpbmcKLWdwaWIuY29uZmlnKHVk LGdwaWIuSWJjVE1PLCBncGliLlQzMHMpICMgU2V0IHRpbWVvdXQgdG8gMzAgc2Vjb25kcwot c2hvd19kZXZpZCh1ZCk7Ci1pbml0aWFsaXNlX2RldmljZSh1ZCk7Ci1ncGliLndyaXRlKGhh bmRsZSwiKlRTVDsqT1BDIikgICAgICAgICAjIFNlbGZ0ZXN0IGFuZCByZXF1ZXN0IE9QQyBl dmVudAotIyBXYWl0IGZvciBUaW1lb3V0IG9yIFJlcXVlc3QgU2VydmljZSBvbiBkZXZpY2UK LXN0YSA9IGdwaWIud2FpdCh1ZCwgZ3BpYi5USU1PIHwgZ3BpYi5SUVMpCi1pZiAoc3RhICYg Z3BpYi5USU1PKSAhPSAwOgotICAgcHJpbnQgIlRpbWVkIG91dCIKLWVsc2U6Ci0gICAgcHJp bnQgIkRldmljZSBhc3NlcnRlZCBSUVMiCi0gICAgc3RiID0gZ3BpYi5zZXJpYWxfcG9sbCh1 ZCkgICAgICAgICAgIyBSZWFkIHN0YXR1cyBieXRlCi0gICAgcHJpbnQgInN0YiA9ICUjeCIl KHN0YikKKyAgICBwcmludChxdWVyeShoYW5kbGUsICIqSUROPyIpKQorICAgIHJldHVybgor CisKK2RlZiBzZWxmdGVzdChoYW5kbGUsIGJvYXJkLCBkZXZpY2UpOgorICAgIHByaW50KGdw aWIudmVyc2lvbigpKSAgICAgICAgICAgICAgICAgICAjIFNob3cgcGFja2FnZSB2ZXJzaW9u CisgICAgdWQgPSBncGliLmRldihib2FyZCwgZGV2aWNlKSAgICAgICAgICAgICMgT3BlbiB0 aGUgZGV2aWNlCisgICAgZ3BpYi5jb25maWcoYm9hcmQsIGdwaWIuSWJjQVVUT1BPTEwsIDEp ICAjIEVuYWJsZSBhdXRvbWF0aWMgc2VyaWFsIHBvbGxpbmcKKyAgICBncGliLmNvbmZpZyh1 ZCwgZ3BpYi5JYmNUTU8sIGdwaWIuVDMwcykgICMgU2V0IHRpbWVvdXQgdG8gMzAgc2Vjb25k cworICAgIHNob3dfZGV2aWQodWQpCisgICAgaW5pdGlhbGlzZV9kZXZpY2UodWQpCisgICAg Z3BpYi53cml0ZShoYW5kbGUsICIqVFNUOypPUEMiKSAgICAgICAgICMgU2VsZnRlc3QgYW5k IHJlcXVlc3QgT1BDIGV2ZW50CisgICAgIyBXYWl0IGZvciBUaW1lb3V0IG9yIFJlcXVlc3Qg U2VydmljZSBvbiBkZXZpY2UKKyAgICBzdGEgPSBncGliLndhaXQodWQsIGdwaWIuVElNTyB8 IGdwaWIuUlFTKQorICAgIGlmIChzdGEgJiBncGliLlRJTU8pICE9IDA6CisgICAgICAgIHBy aW50KCJUaW1lZCBvdXQiKQorICAgIGVsc2U6CisgICAgICAgIHByaW50KCJEZXZpY2UgYXNz ZXJ0ZWQgUlFTIikKKyAgICAgICAgc3RiID0gZ3BpYi5zZXJpYWxfcG9sbCh1ZCkgICAgICAg ICAgIyBSZWFkIHN0YXR1cyBieXRlCisgICAgICAgIHByaW50KCJzdGIgPSAlI3giICUgKHN0 YikpCiAgICAgaWYgKHN0YiAmIGdwaWIuSWJTdGJFU0IpICE9IDA6ICAgICAgIyBDaGVjayBm b3IgRXZlbnQgU3RhdHVzIGJpdAotICAgICAgICAgICAgZXNyID0gaW50KHF1ZXJ5KHVkLCJF U1I/IikpICMgUmVhZCBFdmVudCBTdGF0dXMgUmVnaXN0ZXIKLSAgICAgICAgICAgIGlmIChl c3IgJiAxKSAhPSAwOiAgICAgICAgICAjIENoZWNrIGZvciBvcGVyYXRpb24gY29tcGxldGVk Ci0gICAgICAgICAgICAgICAgICAgIHByaW50ICJEZXZpY2UgT3BlcmF0aW9uIENvbXBsZXRl ZCIKKyAgICAgICAgZXNyID0gaW50KHF1ZXJ5KHVkLCAiRVNSPyIpKSAgIyBSZWFkIEV2ZW50 IFN0YXR1cyBSZWdpc3RlcgorICAgICAgICBpZiAoZXNyICYgMSkgIT0gMDogICAgICAgICAg IyBDaGVjayBmb3Igb3BlcmF0aW9uIGNvbXBsZXRlZAorICAgICAgICAgICAgcHJpbnQoIkRl dmljZSBPcGVyYXRpb24gQ29tcGxldGVkIikKIAotIyBkb25lICAKLWdwaWIuY2xvc2UodWQp CisgICAgIyBkb25lCisgICAgZ3BpYi5jbG9zZSh1ZCkKLS0gCjIuNDMuMAoK --------------2FWK14R7wtgV0Xavw4AR2k6g Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --------------2FWK14R7wtgV0Xavw4AR2k6g Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Linux-gpib-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-gpib-general --------------2FWK14R7wtgV0Xavw4AR2k6g--