[PATCH] Format Gpib.py and gpibtest.py
Matthias Geiger <[email protected]> Wed, 1 Apr 2026 11:21:41 +0200
| Newsgroups | gmane.linux.hardware.gpib.general |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --------------U9pjIF8hPtuM9nzn7RA0iQZL Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi, attached are two patches modernizing and formatting Gpib.py and gpibtest.py. Except for one print() statement there are no functional changes. -- 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 --------------U9pjIF8hPtuM9nzn7RA0iQZL Content-Type: text/x-patch; charset=UTF-8; name="0001-language-python-Gpib.py-Format-with-black.patch" Content-Disposition: attachment; filename="0001-language-python-Gpib.py-Format-with-black.patch" Content-Transfer-Encoding: base64 RnJvbSAxMTlmZGRjODBjMDIyNDkxNDUwZGJhOTJhZTVkOTE3MGU2YjQwMzRmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGlhcyBHZWlnZXIgPHdlcmRhaGlhc0BkZWJp YW4ub3JnPgpEYXRlOiBXZWQsIDEgQXByIDIwMjYgMTE6MTY6MTcgKzAyMDAKU3ViamVjdDog bGFuZ3VhZ2UvcHl0aG9uL0dwaWIucHk6IEZvcm1hdCB3aXRoIGJsYWNrCgpTaWduZWQtb2Zm LWJ5OiBNYXR0aGlhcyBHZWlnZXIgPHdlcmRhaGlhc0BkZWJpYW4ub3JnPgotLS0KIGxpbnV4 LWdwaWItdXNlci9sYW5ndWFnZS9weXRob24vR3BpYi5weSB8IDE5NiArKysrKysrKysrKyst LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA5OCBpbnNlcnRpb25zKCspLCA5OCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saW51eC1ncGliLXVzZXIvbGFuZ3VhZ2UvcHl0aG9u L0dwaWIucHkgYi9saW51eC1ncGliLXVzZXIvbGFuZ3VhZ2UvcHl0aG9uL0dwaWIucHkKaW5k ZXggN2YxMWE0ZWIuLjcyYmJiZjc0IDEwMDY0NAotLS0gYS9saW51eC1ncGliLXVzZXIvbGFu Z3VhZ2UvcHl0aG9uL0dwaWIucHkKKysrIGIvbGludXgtZ3BpYi11c2VyL2xhbmd1YWdlL3B5 dGhvbi9HcGliLnB5CkBAIC0xLDEwMyArMSwxMDMgQEAKLQogaW1wb3J0IGdwaWIKIAotUlFT ID0gKDE8PDExKQotU1JRID0gKDE8PDEyKQotVElNTyA9ICgxPDwxNCkKK1JRUyA9IDEgPDwg MTEKK1NSUSA9IDEgPDwgMTIKK1RJTU8gPSAxIDw8IDE0CiAKIAogY2xhc3MgR3BpYihvYmpl Y3QpOgotCScnJ1RocmVlIHdheXMgdG8gY3JlYXRlIGEgR3BpYiBvYmplY3Q6Ci0JR3BpYigi bmFtZSIpCi0JCXJldHVybnMgYSBib2FyZCBvciBkZXZpY2Ugb2JqZWN0LCBmcm9tIGEgbmFt ZSBpbiB0aGUgY29uZmlnIGZpbGUKLQlHcGliKGJvYXJkX2luZGV4KQotCQlyZXR1cm5zIGEg Ym9hcmQgb2JqZWN0LCB3aXRoIHRoZSBnaXZlbiBib2FyZCBudW1iZXIKLQlHcGliKGJvYXJk X2luZGV4LCBwYWRbLCBzYWRbLCB0aW1lb3V0Wywgc2VuZF9lb2lbLCBlb3NfbW9kZV1dXV0p Ci0JCXJldHVybnMgYSBkZXZpY2Ugb2JqZWN0LCBsaWtlIGliZGV2KCknJycKLQotCWRlZiBf X2luaXRfXyhzZWxmLCBuYW1lID0gJ2dwaWIwJywgcGFkID0gTm9uZSwgc2FkID0gMCwgdGlt ZW91dCA9IDEzLCBzZW5kX2VvaSA9IDEsIGVvc19tb2RlID0gMCk6Ci0JCXNlbGYuX293biA9 IEZhbHNlCi0JCWlmIGlzaW5zdGFuY2UobmFtZSwgc3RyKToKLQkJCXNlbGYuaWQgPSBncGli LmZpbmQobmFtZSkKLQkJCXNlbGYuX293biA9IFRydWUKLQkJZWxpZiBwYWQgaXMgTm9uZToK LQkJCXNlbGYuaWQgPSBuYW1lCi0JCWVsc2U6Ci0JCQlzZWxmLmlkID0gZ3BpYi5kZXYobmFt ZSwgcGFkLCBzYWQsIHRpbWVvdXQsIHNlbmRfZW9pLCBlb3NfbW9kZSkKLQkJCXNlbGYuX293 biA9IFRydWUKLQotCSMgYXV0b21hdGljYWxseSBjbG9zZSBkZXNjcmlwdG9yIHdoZW4gaW5z dGFuY2UgaXMgZGVsZXRlZAotCWRlZiBfX2RlbF9fKHNlbGYpOgotCQlzZWxmLmNsb3NlKCkK LQotCWRlZiBfX3JlcHJfXyhzZWxmKToKLQkJcmV0dXJuICIlcyglZCkiICUgKHNlbGYuX19j bGFzc19fLl9fbmFtZV9fLCBzZWxmLmlkKQotCi0KLQlkZWYgY2xvc2Uoc2VsZik6Ci0JCWlm IHNlbGYuX293bjoKLQkJCWdwaWIuY2xvc2Uoc2VsZi5pZCkKLQkJCXNlbGYuX293biA9IEZh bHNlCi0KLQlkZWYgY29tbWFuZChzZWxmLHN0cik6Ci0JCWdwaWIuY29tbWFuZChzZWxmLmlk LCBzdHIpCi0KLQlkZWYgY29uZmlnKHNlbGYsb3B0aW9uLHZhbHVlKToKLQkJc2VsZi5yZXMg PSBncGliLmNvbmZpZyhzZWxmLmlkLG9wdGlvbix2YWx1ZSkKLQkJcmV0dXJuIHNlbGYucmVz Ci0KLQlkZWYgaW50ZXJmYWNlX2NsZWFyKHNlbGYpOgotCQlncGliLmludGVyZmFjZV9jbGVh cihzZWxmLmlkKQotCi0JZGVmIHdyaXRlKHNlbGYsc3RyKToKLQkJZ3BpYi53cml0ZShzZWxm LmlkLCBzdHIpCi0KLQlkZWYgd3JpdGVfYXN5bmMoc2VsZixzdHIpOgotCQlncGliLndyaXRl X2FzeW5jKHNlbGYuaWQsIHN0cikKLQotCWRlZiByZWFkKHNlbGYsbGVuPTUxMik6Ci0JCXNl bGYucmVzID0gZ3BpYi5yZWFkKHNlbGYuaWQsbGVuKQotCQlyZXR1cm4gc2VsZi5yZXMKLQot CWRlZiBsaXN0ZW5lcihzZWxmLHBhZCxzYWQ9MCk6Ci0JCXNlbGYucmVzID0gZ3BpYi5saXN0 ZW5lcihzZWxmLmlkLHBhZCxzYWQpCi0JCXJldHVybiBzZWxmLnJlcwotCi0JZGVmIGxpbmVz KHNlbGYpOgotCQlzZWxmLnJlcyA9IGdwaWIubGluZXMoc2VsZi5pZCkKLQkJcmV0dXJuIHNl bGYucmVzCi0KLQlkZWYgYXNrKHNlbGYsb3B0aW9uKToKLQkJc2VsZi5yZXMgPSBncGliLmFz ayhzZWxmLmlkLG9wdGlvbikKLQkJcmV0dXJuIHNlbGYucmVzCi0KLQlkZWYgY2xlYXIoc2Vs Zik6Ci0JCWdwaWIuY2xlYXIoc2VsZi5pZCkKLQotCWRlZiB3YWl0KHNlbGYsbWFzayk6Ci0J CWdwaWIud2FpdChzZWxmLmlkLG1hc2spCi0KLQlkZWYgc2VyaWFsX3BvbGwoc2VsZik6Ci0J CXNlbGYuc3BiID0gZ3BpYi5zZXJpYWxfcG9sbChzZWxmLmlkKQotCQlyZXR1cm4gc2VsZi5z cGIKLQotCWRlZiB0cmlnZ2VyKHNlbGYpOgotCQlncGliLnRyaWdnZXIoc2VsZi5pZCkKLQot CWRlZiByZW1vdGVfZW5hYmxlKHNlbGYsdmFsKToKLQkJZ3BpYi5yZW1vdGVfZW5hYmxlKHNl bGYuaWQsdmFsKQotCi0JZGVmIGlibG9jKHNlbGYpOgotCQlzZWxmLnJlcyA9IGdwaWIuaWJs b2Moc2VsZi5pZCkKLQkJcmV0dXJuIHNlbGYucmVzCi0KLQlkZWYgaWJzdGEoc2VsZik6Ci0J CXNlbGYucmVzID0gZ3BpYi5pYnN0YSgpCi0JCXJldHVybiBzZWxmLnJlcwotCi0JZGVmIGli Y250KHNlbGYpOgotCQlzZWxmLnJlcyA9IGdwaWIuaWJjbnQoKQotCQlyZXR1cm4gc2VsZi5y ZXMKLQotCWRlZiB0aW1lb3V0KHNlbGYsdmFsdWUpOgotCQlyZXR1cm4gZ3BpYi50aW1lb3V0 KHNlbGYuaWQsdmFsdWUpCisgICAgIiIiVGhyZWUgd2F5cyB0byBjcmVhdGUgYSBHcGliIG9i amVjdDoKKyAgICBHcGliKCJuYW1lIikKKyAgICAgICAgICAgIHJldHVybnMgYSBib2FyZCBv ciBkZXZpY2Ugb2JqZWN0LCBmcm9tIGEgbmFtZSBpbiB0aGUgY29uZmlnIGZpbGUKKyAgICBH cGliKGJvYXJkX2luZGV4KQorICAgICAgICAgICAgcmV0dXJucyBhIGJvYXJkIG9iamVjdCwg d2l0aCB0aGUgZ2l2ZW4gYm9hcmQgbnVtYmVyCisgICAgR3BpYihib2FyZF9pbmRleCwgcGFk Wywgc2FkWywgdGltZW91dFssIHNlbmRfZW9pWywgZW9zX21vZGVdXV1dKQorICAgICAgICAg ICAgcmV0dXJucyBhIGRldmljZSBvYmplY3QsIGxpa2UgaWJkZXYoKSIiIgorCisgICAgZGVm IF9faW5pdF9fKAorICAgICAgICBzZWxmLCBuYW1lPSJncGliMCIsIHBhZD1Ob25lLCBzYWQ9 MCwgdGltZW91dD0xMywgc2VuZF9lb2k9MSwgZW9zX21vZGU9MAorICAgICk6CisgICAgICAg IHNlbGYuX293biA9IEZhbHNlCisgICAgICAgIGlmIGlzaW5zdGFuY2UobmFtZSwgc3RyKToK KyAgICAgICAgICAgIHNlbGYuaWQgPSBncGliLmZpbmQobmFtZSkKKyAgICAgICAgICAgIHNl bGYuX293biA9IFRydWUKKyAgICAgICAgZWxpZiBwYWQgaXMgTm9uZToKKyAgICAgICAgICAg IHNlbGYuaWQgPSBuYW1lCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLmlkID0g Z3BpYi5kZXYobmFtZSwgcGFkLCBzYWQsIHRpbWVvdXQsIHNlbmRfZW9pLCBlb3NfbW9kZSkK KyAgICAgICAgICAgIHNlbGYuX293biA9IFRydWUKKworICAgICMgYXV0b21hdGljYWxseSBj bG9zZSBkZXNjcmlwdG9yIHdoZW4gaW5zdGFuY2UgaXMgZGVsZXRlZAorICAgIGRlZiBfX2Rl bF9fKHNlbGYpOgorICAgICAgICBzZWxmLmNsb3NlKCkKKworICAgIGRlZiBfX3JlcHJfXyhz ZWxmKToKKyAgICAgICAgcmV0dXJuICIlcyglZCkiICUgKHNlbGYuX19jbGFzc19fLl9fbmFt ZV9fLCBzZWxmLmlkKQorCisgICAgZGVmIGNsb3NlKHNlbGYpOgorICAgICAgICBpZiBzZWxm Ll9vd246CisgICAgICAgICAgICBncGliLmNsb3NlKHNlbGYuaWQpCisgICAgICAgICAgICBz ZWxmLl9vd24gPSBGYWxzZQorCisgICAgZGVmIGNvbW1hbmQoc2VsZiwgc3RyKToKKyAgICAg ICAgZ3BpYi5jb21tYW5kKHNlbGYuaWQsIHN0cikKKworICAgIGRlZiBjb25maWcoc2VsZiwg b3B0aW9uLCB2YWx1ZSk6CisgICAgICAgIHNlbGYucmVzID0gZ3BpYi5jb25maWcoc2VsZi5p ZCwgb3B0aW9uLCB2YWx1ZSkKKyAgICAgICAgcmV0dXJuIHNlbGYucmVzCisKKyAgICBkZWYg aW50ZXJmYWNlX2NsZWFyKHNlbGYpOgorICAgICAgICBncGliLmludGVyZmFjZV9jbGVhcihz ZWxmLmlkKQorCisgICAgZGVmIHdyaXRlKHNlbGYsIHN0cik6CisgICAgICAgIGdwaWIud3Jp dGUoc2VsZi5pZCwgc3RyKQorCisgICAgZGVmIHdyaXRlX2FzeW5jKHNlbGYsIHN0cik6Cisg ICAgICAgIGdwaWIud3JpdGVfYXN5bmMoc2VsZi5pZCwgc3RyKQorCisgICAgZGVmIHJlYWQo c2VsZiwgbGVuPTUxMik6CisgICAgICAgIHNlbGYucmVzID0gZ3BpYi5yZWFkKHNlbGYuaWQs IGxlbikKKyAgICAgICAgcmV0dXJuIHNlbGYucmVzCisKKyAgICBkZWYgbGlzdGVuZXIoc2Vs ZiwgcGFkLCBzYWQ9MCk6CisgICAgICAgIHNlbGYucmVzID0gZ3BpYi5saXN0ZW5lcihzZWxm LmlkLCBwYWQsIHNhZCkKKyAgICAgICAgcmV0dXJuIHNlbGYucmVzCisKKyAgICBkZWYgbGlu ZXMoc2VsZik6CisgICAgICAgIHNlbGYucmVzID0gZ3BpYi5saW5lcyhzZWxmLmlkKQorICAg ICAgICByZXR1cm4gc2VsZi5yZXMKKworICAgIGRlZiBhc2soc2VsZiwgb3B0aW9uKToKKyAg ICAgICAgc2VsZi5yZXMgPSBncGliLmFzayhzZWxmLmlkLCBvcHRpb24pCisgICAgICAgIHJl dHVybiBzZWxmLnJlcworCisgICAgZGVmIGNsZWFyKHNlbGYpOgorICAgICAgICBncGliLmNs ZWFyKHNlbGYuaWQpCisKKyAgICBkZWYgd2FpdChzZWxmLCBtYXNrKToKKyAgICAgICAgZ3Bp Yi53YWl0KHNlbGYuaWQsIG1hc2spCisKKyAgICBkZWYgc2VyaWFsX3BvbGwoc2VsZik6Cisg ICAgICAgIHNlbGYuc3BiID0gZ3BpYi5zZXJpYWxfcG9sbChzZWxmLmlkKQorICAgICAgICBy ZXR1cm4gc2VsZi5zcGIKKworICAgIGRlZiB0cmlnZ2VyKHNlbGYpOgorICAgICAgICBncGli LnRyaWdnZXIoc2VsZi5pZCkKKworICAgIGRlZiByZW1vdGVfZW5hYmxlKHNlbGYsIHZhbCk6 CisgICAgICAgIGdwaWIucmVtb3RlX2VuYWJsZShzZWxmLmlkLCB2YWwpCisKKyAgICBkZWYg aWJsb2Moc2VsZik6CisgICAgICAgIHNlbGYucmVzID0gZ3BpYi5pYmxvYyhzZWxmLmlkKQor ICAgICAgICByZXR1cm4gc2VsZi5yZXMKKworICAgIGRlZiBpYnN0YShzZWxmKToKKyAgICAg ICAgc2VsZi5yZXMgPSBncGliLmlic3RhKCkKKyAgICAgICAgcmV0dXJuIHNlbGYucmVzCisK KyAgICBkZWYgaWJjbnQoc2VsZik6CisgICAgICAgIHNlbGYucmVzID0gZ3BpYi5pYmNudCgp CisgICAgICAgIHJldHVybiBzZWxmLnJlcworCisgICAgZGVmIHRpbWVvdXQoc2VsZiwgdmFs dWUpOgorICAgICAgICByZXR1cm4gZ3BpYi50aW1lb3V0KHNlbGYuaWQsIHZhbHVlKQotLSAK Mi40My4wCgo= --------------U9pjIF8hPtuM9nzn7RA0iQZL Content-Type: text/x-patch; charset=UTF-8; name="0002-language-python-gpibtest.py-Format-with-black.patch" Content-Disposition: attachment; filename="0002-language-python-gpibtest.py-Format-with-black.patch" Content-Transfer-Encoding: base64 RnJvbSA2OTAxNjJhNDQxZjNkMGMwYzExNTY3MGI1YTQxM2FhNDJmNmQ1YTE4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGlhcyBHZWlnZXIgPHdlcmRhaGlhc0BkZWJp YW4ub3JnPgpEYXRlOiBXZWQsIDEgQXByIDIwMjYgMTE6MTk6MTMgKzAyMDAKU3ViamVjdDog bGFuZ3VhZ2UvcHl0aG9uL2dwaWJ0ZXN0LnB5OiBGb3JtYXQgd2l0aCBibGFjawoKU2lnbmVk LW9mZi1ieTogTWF0dGhpYXMgR2VpZ2VyIDx3ZXJkYWhpYXNAZGViaWFuLm9yZz4KLS0tCiBs aW51eC1ncGliLXVzZXIvbGFuZ3VhZ2UvcHl0aG9uL2dwaWJ0ZXN0LnB5IHwgMTEgKysrKy0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbGludXgtZ3BpYi11c2VyL2xhbmd1YWdlL3B5dGhvbi9ncGlidGVz dC5weSBiL2xpbnV4LWdwaWItdXNlci9sYW5ndWFnZS9weXRob24vZ3BpYnRlc3QucHkKaW5k ZXggNjA1MGY0MjguLjJhNThiMWIyIDEwMDY0NAotLS0gYS9saW51eC1ncGliLXVzZXIvbGFu Z3VhZ2UvcHl0aG9uL2dwaWJ0ZXN0LnB5CisrKyBiL2xpbnV4LWdwaWItdXNlci9sYW5ndWFn ZS9weXRob24vZ3BpYnRlc3QucHkKQEAgLTEsMTYgKzEsMTMgQEAKIGZyb20gdGltZSBpbXBv cnQgc2xlZXAKIGZyb20gR3BpYiBpbXBvcnQgKgogCi12ID0gR3BpYigndm9sdG1ldGVyJykK K3YgPSBHcGliKCJ2b2x0bWV0ZXIiKQogCiB2LmNsZWFyKCkKIAotdi53cml0ZSgnRDAgUTAn KQordi53cml0ZSgiRDAgUTAiKQogCiBzbGVlcCgxKQogCi1mb3IgaSBpbiByYW5nZSgwLDEw KToKLQlwcmludCB2LnJlYWQoKQotCi0KLQorZm9yIGkgaW4gcmFuZ2UoMCwgMTApOgorICAg IHByaW50KHYucmVhZCgpKQotLSAKMi40My4wCgo= --------------U9pjIF8hPtuM9nzn7RA0iQZL Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --------------U9pjIF8hPtuM9nzn7RA0iQZL 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 --------------U9pjIF8hPtuM9nzn7RA0iQZL--