June 2020 - Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] Fix remaining errors on Python3 startup #7923
by Alex Page 01 Jun '20

01 Jun '20

# HG changeset patch # User Alex Page <a.t.page(a)gmail.com> # Date 1591030652 14400 # Mon Jun 01 12:57:32 2020 -0400 # Branch py3 # Node ID 7c4c5bde73f6d6364de8e21abba37fa2ad5052d4 # Parent a9922865fad99188e5f298006f374167211efad5 Fix remaining errors on Python3 startup #7923 diff --git a/chirp/drivers/tk270.py b/chirp/drivers/tk270.py --- a/chirp/drivers/tk270.py +++ b/chirp/drivers/tk270.py @@ -96,7 +96,7 @@ MEM_SIZE = 0x400 BLOCK_SIZE = 8 -MEM_BLOCKS = range(0, (MEM_SIZE / BLOCK_SIZE)) +MEM_BLOCKS = range(0, (MEM_SIZE // BLOCK_SIZE)) ACK_CMD = "\x06" TIMEOUT = 0.05 # from 0.03 up it' s safe, we set in 0.05 for a margin @@ -242,7 +242,7 @@ # UI progress status = chirp_common.Status() status.cur = 0 - status.max = MEM_SIZE / BLOCK_SIZE + status.max = MEM_SIZE // BLOCK_SIZE status.msg = "Cloning from radio..." radio.status_fn(status) @@ -269,7 +269,7 @@ # UI progress status = chirp_common.Status() status.cur = 0 - status.max = MEM_SIZE / BLOCK_SIZE + status.max = MEM_SIZE // BLOCK_SIZE status.msg = "Cloning to radio..." radio.status_fn(status) count = 0 @@ -630,7 +630,7 @@ return # freq rx - _mem.rxfreq = mem.freq / 10 + _mem.rxfreq = mem.freq // 10 # rx enabled if valid channel, # set tx to on, we decide if off after duplex = off @@ -639,9 +639,9 @@ # freq tx if mem.duplex == "+": - _mem.txfreq = (mem.freq + mem.offset) / 10 + _mem.txfreq = (mem.freq + mem.offset) // 10 elif mem.duplex == "-": - _mem.txfreq = (mem.freq - mem.offset) / 10 + _mem.txfreq = (mem.freq - mem.offset) // 10 elif mem.duplex == "off": # set tx freq on the memap to xff for i in range(0, 4): @@ -649,7 +649,7 @@ # erase the txen flag _mem.txen = 255 else: - _mem.txfreq = mem.freq / 10 + _mem.txfreq = mem.freq // 10 # tone data ((txmode, txtone, txpol), (rxmode, rxtone, rxpol)) = \ diff --git a/chirp/drivers/tk760.py b/chirp/drivers/tk760.py --- a/chirp/drivers/tk760.py +++ b/chirp/drivers/tk760.py @@ -97,7 +97,7 @@ MEM_SIZE = 0x400 BLOCK_SIZE = 8 -MEM_BLOCKS = range(0, (MEM_SIZE / BLOCK_SIZE)) +MEM_BLOCKS = range(0, (MEM_SIZE // BLOCK_SIZE)) ACK_CMD = "\x06" # from 0.03 up it' s safe # I have to turn it up, some users reported problems with this, was 0.05 @@ -256,7 +256,7 @@ # UI progress status = chirp_common.Status() status.cur = 0 - status.max = MEM_SIZE / BLOCK_SIZE + status.max = MEM_SIZE // BLOCK_SIZE status.msg = "Cloning from radio..." radio.status_fn(status) @@ -283,7 +283,7 @@ # UI progress status = chirp_common.Status() status.cur = 0 - status.max = MEM_SIZE / BLOCK_SIZE + status.max = MEM_SIZE // BLOCK_SIZE status.msg = "Cloning to radio..." radio.status_fn(status) count = 0 @@ -637,18 +637,18 @@ return # freq rx - _mem.rxfreq = mem.freq / 10 + _mem.rxfreq = mem.freq // 10 # freq tx if mem.duplex == "+": - _mem.txfreq = (mem.freq + mem.offset) / 10 + _mem.txfreq = (mem.freq + mem.offset) // 10 elif mem.duplex == "-": - _mem.txfreq = (mem.freq - mem.offset) / 10 + _mem.txfreq = (mem.freq - mem.offset) // 10 elif mem.duplex == "off": for byte in _mem.txfreq: byte.set_raw("\xFF") else: - _mem.txfreq = mem.freq / 10 + _mem.txfreq = mem.freq // 10 # tone data ((txmode, txtone, txpol), (rxmode, rxtone, rxpol)) = \ diff --git a/chirp/drivers/tk760g.py b/chirp/drivers/tk760g.py --- a/chirp/drivers/tk760g.py +++ b/chirp/drivers/tk760g.py @@ -263,13 +263,13 @@ MEM_SIZE = 0x8000 # 32,768 bytes BLOCK_SIZE = 256 -BLOCKS = MEM_SIZE / BLOCK_SIZE +BLOCKS = MEM_SIZE // BLOCK_SIZE MEM_BLOCKS = range(0, BLOCKS) # define and empty block of data, as it will be used a lot in this code EMPTY_BLOCK = "\xFF" * 256 -RO_BLOCKS = range(0x10, 0x1F) + range(0x59, 0x5f) +RO_BLOCKS = list(range(0x10, 0x1F)) + list(range(0x59, 0x5f)) ACK_CMD = "\x06" POWER_LEVELS = [chirp_common.PowerLevel("Low", watts=1), @@ -529,7 +529,7 @@ # reset UI data status.cur = 0 - status.max = MEM_SIZE / 256 + status.max = MEM_SIZE // 256 status.msg = "Cloning from radio..." radio.status_fn(status) @@ -580,7 +580,7 @@ # update UI status.cur = 0 - status.max = MEM_SIZE / 256 + status.max = MEM_SIZE // 256 status.msg = "Cloning to radio..." radio.status_fn(status) @@ -843,7 +843,7 @@ bdata += (256 - (len(bdata)) % 256) * "\xFF" # fill to match the whole area - bdata += (16 - len(bdata) / 256) * EMPTY_BLOCK + bdata += (16 - len(bdata) // 256) * EMPTY_BLOCK # updating the data in the memmap [x1000] self._fill(0x1000, bdata) @@ -958,7 +958,7 @@ """Get the channel scan status from the 16 bytes array on the eeprom then from the bits on the byte, return '' or 'S' as needed""" result = "S" - byte = int(chan/8) + byte = int(chan//8) bit = chan % 8 res = self._memobj.settings.add[byte] & (pow(2, bit)) if res > 0: @@ -968,7 +968,7 @@ def _set_scan(self, chan, value): """Set the channel scan status from UI to the mem_map""" - byte = int(chan/8) + byte = int(chan//8) bit = chan % 8 # get the actual value to see if I need to change anything @@ -1086,7 +1086,7 @@ return # frequency - _mem.rxfreq = mem.freq / 10 + _mem.rxfreq = mem.freq // 10 # this are a mistery yet, but so falr there is no impact # whit this default values for new channels @@ -1096,14 +1096,14 @@ # duplex if mem.duplex == "+": - _mem.txfreq = (mem.freq + mem.offset) / 10 + _mem.txfreq = (mem.freq + mem.offset) // 10 elif mem.duplex == "-": - _mem.txfreq = (mem.freq - mem.offset) / 10 + _mem.txfreq = (mem.freq - mem.offset) // 10 elif mem.duplex == "off": for byte in _mem.txfreq: byte.set_raw("\xFF") else: - _mem.txfreq = mem.freq / 10 + _mem.txfreq = mem.freq // 10 # tone data ((txmode, txtone, txpol), (rxmode, rxtone, rxpol)) = \

1 0

[chirp_devel] [PATCH] Fix some list/dict related syntax errors in Python3 #7923
by Alex Page 01 Jun '20

01 Jun '20

# HG changeset patch # User Alex Page <a.t.page(a)gmail.com> # Date 1591029599 14400 # Mon Jun 01 12:39:59 2020 -0400 # Branch py3 # Node ID a9922865fad99188e5f298006f374167211efad5 # Parent 71b08c265f2136cd1b66fb2095aaaaf81302ab55 Fix some list/dict related syntax errors in Python3 #7923 diff --git a/chirp/drivers/ap510.py b/chirp/drivers/ap510.py --- a/chirp/drivers/ap510.py +++ b/chirp/drivers/ap510.py @@ -242,7 +242,7 @@ class AP510Memory20141215(AP510Memory): """Compatible with firmware version 20141215""" - ATTR_MAP = dict(AP510Memory.ATTR_MAP.items() + { + ATTR_MAP = dict(list(AP510Memory.ATTR_MAP.items()) + list({ 'tx_volume': '21', # 1-6 'rx_volume': '22', # 1-9 'tx_power': '23', # 1: 1 watt, 0: 0.5 watt @@ -252,7 +252,7 @@ 'path3': '27', # like "WIDE1 1" else "0" 'multiple': '28', 'auto_on': '29', - }.items()) + }.items())) def get_multiple(self): return dict(zip( diff --git a/chirp/drivers/ft70.py b/chirp/drivers/ft70.py --- a/chirp/drivers/ft70.py +++ b/chirp/drivers/ft70.py @@ -528,7 +528,7 @@ _GM_RING = ("OFF", "IN RING", "AlWAYS") _GM_INTERVAL = ("LONG", "NORMAL", "OFF") - _MYCALL_CHR_SET = list(string.uppercase) + list(string.digits) + ['-','/' ] + _MYCALL_CHR_SET = list(string.ascii_uppercase) + list(string.digits) + ['-','/' ] @classmethod def get_prompts(cls): diff --git a/chirp/drivers/ft90.py b/chirp/drivers/ft90.py --- a/chirp/drivers/ft90.py +++ b/chirp/drivers/ft90.py @@ -52,7 +52,7 @@ chirp_common.PowerLevel("Low", watts=5)] FT90_DUPLEX = ["", "-", "+", "split"] -FT90_CWID_CHARS = list(string.digits) + list(string.uppercase) + list(" ") +FT90_CWID_CHARS = list(string.digits) + list(string.ascii_uppercase) + list(" ") FT90_DTMF_CHARS = list("0123456789ABCD*#") FT90_SPECIAL = ["vfo_vhf", "home_vhf", "vfo_uhf", "home_uhf", "pms_1L", "pms_1U", "pms_2L", "pms_2U"] diff --git a/chirp/drivers/leixen.py b/chirp/drivers/leixen.py --- a/chirp/drivers/leixen.py +++ b/chirp/drivers/leixen.py @@ -226,7 +226,7 @@ ] MODES = ["NFM", "FM"] -WTFTONES = map(float, range(56, 64)) +WTFTONES = list(map(float, range(56, 64))) TONES = WTFTONES + chirp_common.TONES DTCS_CODES = [17, 50, 645] + chirp_common.DTCS_CODES DTCS_CODES.sort() diff --git a/chirp/drivers/ts850.py b/chirp/drivers/ts850.py --- a/chirp/drivers/ts850.py +++ b/chirp/drivers/ts850.py @@ -26,7 +26,7 @@ TS850_SKIP = ["", "S"] TS850_MODES = { - "N/A": " ", + "N/A": " ", # why is this here? the line below removes it. "N/A": "0", "LSB": "1", "USB": "2", @@ -37,7 +37,7 @@ "CW-R": "7", "FSK-R": "9", } -TS850_MODES_REV = {val: mode for mode, val in TS850_MODES.iteritems()} +TS850_MODES_REV = {val: mode for mode, val in TS850_MODES.items()} TS850_TONES = list(chirp_common.OLD_TONES) TS850_TONES.remove(69.3)

1 0

[chirp_devel] [PATCH] Fix range() related errors in Python3 #7923
by Alex Page 01 Jun '20

01 Jun '20

# HG changeset patch # User Alex Page <a.t.page(a)gmail.com> # Date 1591028543 14400 # Mon Jun 01 12:22:23 2020 -0400 # Branch py3 # Node ID 71b08c265f2136cd1b66fb2095aaaaf81302ab55 # Parent 1c8561d30ebe95eefffcd8ab1be62d6f4cbf7d09 Fix range() related errors in Python3 #7923 diff --git a/chirp/drivers/ft450d.py b/chirp/drivers/ft450d.py --- a/chirp/drivers/ft450d.py +++ b/chirp/drivers/ft450d.py @@ -304,8 +304,8 @@ struct mem_struct current; """ - _CALLSIGN_CHARSET = [chr(x) for x in range(ord("0"), ord("9") + 1) + - range(ord("A"), ord("Z") + 1) + [ord(" ")]] + _CALLSIGN_CHARSET = [chr(x) for x in list(range(ord("0"), ord("9") + 1)) + + list(range(ord("A"), ord("Z") + 1)) + [ord(" ")]] _CALLSIGN_CHARSET_REV = dict(zip(_CALLSIGN_CHARSET, range(0, len(_CALLSIGN_CHARSET)))) diff --git a/chirp/drivers/leixen.py b/chirp/drivers/leixen.py --- a/chirp/drivers/leixen.py +++ b/chirp/drivers/leixen.py @@ -226,7 +226,7 @@ ] MODES = ["NFM", "FM"] -WTFTONES = map(float, xrange(56, 64)) +WTFTONES = map(float, range(56, 64)) TONES = WTFTONES + chirp_common.TONES DTCS_CODES = [17, 50, 645] + chirp_common.DTCS_CODES DTCS_CODES.sort() diff --git a/chirp/drivers/puxing_px888k.py b/chirp/drivers/puxing_px888k.py --- a/chirp/drivers/puxing_px888k.py +++ b/chirp/drivers/puxing_px888k.py @@ -527,7 +527,7 @@ TONE_RESET_TIME = ['Off'] + ['%ds' % x for x in range(1, 256)] DTMF_TONE_RESET_TIME = TONE_RESET_TIME[0:16] -DTMF_GROUPS = zip(["Off", "A", "B", "C", "D", "*", "#"], [255]+range(10, 16)) +DTMF_GROUPS = zip(["Off", "A", "B", "C", "D", "*", "#"], [255]+list(range(10, 16))) FIVE_TONE_STANDARDS = ['ZVEI1', 'ZVEI2', 'CCIR1', 'CCITT'] # should mimic the defaults in the memedit MemoryEditor somewhat @@ -543,10 +543,10 @@ DTMF_ALERT_TRANSPOND = zip(['Off', 'Call alert', 'Transpond-alert', 'Transpond-ID code'], - [255]+range(1, 4)) + [255]+list(range(1, 4))) FIVE_TONE_ALERT_TRANSPOND = zip(['Off', 'Alert tone', 'Transpond', 'Transpond-ID code'], - [255]+range(1, 4)) + [255]+list(range(1, 4))) BFM_BANDS = ['87.5-108MHz', '76.0-91.0MHz', '76.0-108.0MHz', '65.0-76.0MHz'] BFM_STRIDE = ['100kHz', '50kHz']

1 0

[chirp_devel] [PATCH] Fix various import errors on startup #7923
by Alex Page 01 Jun '20

01 Jun '20

# HG changeset patch # User Alex Page <a.t.page(a)gmail.com> # Date 1591027546 14400 # Mon Jun 01 12:05:46 2020 -0400 # Branch py3 # Node ID 1c8561d30ebe95eefffcd8ab1be62d6f4cbf7d09 # Parent f79932bb4294a9b7e7d8b051715aa60fbb9239ed Fix various import errors on startup #7923 diff --git a/chirp/drivers/baofeng_uv3r.py b/chirp/drivers/baofeng_uv3r.py --- a/chirp/drivers/baofeng_uv3r.py +++ b/chirp/drivers/baofeng_uv3r.py @@ -19,7 +19,7 @@ import os import logging -from wouxun_common import do_download, do_upload +from chirp.drivers.wouxun_common import do_download, do_upload from chirp import util, chirp_common, bitwise, errors, directory from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueList, \ diff --git a/chirp/drivers/ft2800.py b/chirp/drivers/ft2800.py --- a/chirp/drivers/ft2800.py +++ b/chirp/drivers/ft2800.py @@ -18,7 +18,7 @@ import logging from chirp import util, memmap, chirp_common, bitwise, directory, errors -from yaesu_clone import YaesuCloneModeRadio +from chirp.drivers.yaesu_clone import YaesuCloneModeRadio LOG = logging.getLogger(__name__) diff --git a/chirp/drivers/th_uv3r25.py b/chirp/drivers/th_uv3r25.py --- a/chirp/drivers/th_uv3r25.py +++ b/chirp/drivers/th_uv3r25.py @@ -22,7 +22,7 @@ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString -from th_uv3r import TYTUV3RRadio, tyt_uv3r_prep, THUV3R_CHARSET +from chirp.drivers.th_uv3r import TYTUV3RRadio, tyt_uv3r_prep, THUV3R_CHARSET def tyt_uv3r_download(radio): diff --git a/chirp/drivers/wouxun.py b/chirp/drivers/wouxun.py --- a/chirp/drivers/wouxun.py +++ b/chirp/drivers/wouxun.py @@ -23,7 +23,7 @@ RadioSettingValueBoolean, RadioSettingValueList, \ RadioSettingValueInteger, RadioSettingValueString, \ RadioSettingValueFloat, RadioSettings -from wouxun_common import wipe_memory, do_download, do_upload +from chirp.drivers.wouxun_common import wipe_memory, do_download, do_upload from textwrap import dedent LOG = logging.getLogger(__name__)

1 0