# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID 0f651b4f02250339fc9ace7fd87075058f64cc21

Fix chirp.logger module (#2347)

This patch addresses some issues with the chirp.logger module in order to use it in chirpc and chirpw. It prints the version string when logging at DEBUG level.

In addition, it embraces and extends the "debug.log" support that was present in chirpw, ensuring all log messages and output end up in that file when running on Win32 or MacOS hosts. It also allows that feature to be tested on Linux by setting CHIRP_DEBUG_LOG in the environment.

diff --git a/chirp/logger.py b/chirp/logger.py index 4cf8fa2..eb29e6f 100644 --- a/chirp/logger.py +++ b/chirp/logger.py @@ -56,6 +56,9 @@ log_level_names = {"critical": logging.CRITICAL,

class Logger(object): + + log_format = '[%(asctime)s] %(name)s - %(levelname)s: %(message)s' + def __init__(self): # create root logger self.logger = logging.getLogger() @@ -67,20 +70,35 @@ class Logger(object): # It can be a number or a name; otherwise, level is set to 'debug' # in order to maintain backward compatibility. CHIRP_DEBUG = os.getenv("CHIRP_DEBUG") - level = logging.WARNING + self.early_level = logging.WARNING if CHIRP_DEBUG: try: - level = int(CHIRP_DEBUG) + self.early_level = int(CHIRP_DEBUG) except ValueError: try: - level = log_level_names[CHIRP_DEBUG] + self.early_level = log_level_names[CHIRP_DEBUG] except KeyError: - level = logging.DEBUG - - self.console = logging.StreamHandler() - self.console.setLevel(level) - format_str = '%(levelname)s: %(message)s' - self.console.setFormatter(logging.Formatter(format_str)) + self.early_level = logging.DEBUG + + # If we're on Win32 or MacOS, we don't use the console; instead, + # we create 'debug.log', redirect all output there, and set the + # console logging handler level to DEBUG. To test this on Linux, + # set CHIRP_DEBUG_LOG in the environment. + console_stream = None + console_format = '%(levelname)s: %(message)s' + if hasattr(sys, "frozen") or not os.isatty(0) \ + or os.getenv("CHIRP_DEBUG_LOG"): + p = platform.get_platform() + log = file(p.config_file("debug.log"), "w", 0) + sys.stdout = log + sys.stderr = log + console_stream = log + console_format = self.log_format + self.early_level = logging.DEBUG + + self.console = logging.StreamHandler(console_stream) + self.console.setLevel(self.early_level) + self.console.setFormatter(logging.Formatter(console_format)) self.logger.addHandler(self.console)

# Set CHIRP_LOG in environment to the name of log file. @@ -94,31 +112,33 @@ class Logger(object): else: self.set_log_level(logging.DEBUG)

+ if self.early_level <= logging.DEBUG: + self.LOG.debug(version_string()) + def create_log_file(self, name): if self.logfile is None: self.logname = name - lf = file(name, "w") - print >>lf, version_string() - lf.close() + # always truncate the log file + with file(name, "w") as fh: + pass self.logfile = logging.FileHandler(name) - format_str = '[%(created)s] %(name)s - %(levelname)s: %(message)s' + format_str = self.log_format self.logfile.setFormatter(logging.Formatter(format_str)) self.logger.addHandler(self.logfile) - else: self.logger.error("already logging to " + self.logname)

def set_verbosity(self, level): + self.LOG.debug("verbosity=%d", level) if level > logging.CRITICAL: level = logging.CRITICAL self.console.setLevel(level) - self.LOG.debug("verbosity=%d", level)

def set_log_level(self, level): + self.LOG.debug("log level=%d", level) if level > logging.CRITICAL: level = logging.CRITICAL self.logfile.setLevel(level) - self.LOG.debug("log level=%d", level)

def set_log_level_by_name(self, level): self.set_log_level(log_level_names[level]) @@ -153,3 +173,6 @@ def handle_options(options): logger.set_log_level(level) except ValueError: logger.set_log_level_by_name(options.log_level) + + if logger.early_level > logging.DEBUG: + logger.LOG.debug(version_string()) diff --git a/chirpc b/chirpc index 6a25e50..16c7006 100755 --- a/chirpc +++ b/chirpc @@ -19,10 +19,14 @@ import serial import sys import argparse +import logging

+from chirp import logger from chirp import * from chirp import chirp_common, errors, idrp, directory, util

+LOG = logging.getLogger("chirpc") + def fail_unsupported(): print "Operation not supported by selected radio" sys.exit(1) @@ -62,6 +66,7 @@ class DTCSPolarityAction(argparse.Action):

if __name__ == "__main__": parser = argparse.ArgumentParser() + logger.add_version_argument(parser) parser.add_argument("-s", "--serial", dest="serial", default="mmap", help="Serial port (default: mmap)") @@ -151,8 +156,10 @@ if __name__ == "__main__": action="store_true", default=False, help="Upload memory map to radio") + logger.add_arguments(parser) parser.add_argument("args", metavar="arg", nargs='*', help="Some commands require additional arguments") + if len(sys.argv) <= 1: parser.print_help() sys.exit(0) @@ -160,6 +167,8 @@ if __name__ == "__main__": options = parser.parse_args() args = options.args

+ logger.handle_options(options) + if options.list_radios: print "Supported Radios:\n\t", "\n\t".join(sorted(RADIOS.keys())) sys.exit(0) diff --git a/chirpw b/chirpw index a3a316c..67c9ee0 100755 --- a/chirpw +++ b/chirpw @@ -17,8 +17,9 @@

import os

+from chirp import logger from chirp import elib_intl -from chirp import platform, CHIRP_VERSION +from chirp import platform from chirpui import config

# Hack to setup environment @@ -30,20 +31,6 @@ import locale import gettext import argparse

-p = platform.get_platform() -if hasattr(sys, "frozen"): - log = file(p.config_file("debug.log"), "w", 0) - sys.stderr = log - sys.stdout = log -elif not os.isatty(0): - log = file(p.config_file("debug.log"), "w", 0) - sys.stdout = log - sys.stderr = log - -print "CHIRP %s on %s (Python %s)" % (CHIRP_VERSION, - platform.get_platform().os_version_string(), - sys.version.split()[0]) - execpath = platform.get_platform().executable_path() localepath = os.path.abspath(os.path.join(execpath, "locale")) if not os.path.exists(localepath): @@ -127,10 +114,14 @@ from chirpui import mainapp, config

parser = argparse.ArgumentParser() parser.add_argument("files", metavar="file", nargs='*', help="File to open") +logger.add_version_argument(parser) parser.add_argument("--profile", action="store_true", help="Enable profiling") +logger.add_arguments(parser) args = parser.parse_args()

+logger.handle_options(args) + a = mainapp.ChirpMain()

for i in args.files:

# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID fb1897f975f805f2c6d5b51e4b790fe1a24c7292

Use new logger module (#2347)

This patch chases down all references to CHIRP_DEBUG, converting the wrapped print calls to LOG.debug calls. It also eliminates a few plain DEBUG variables and a couple of other one-off variants.

diff --git a/chirp/anytone.py b/chirp/anytone.py index 4b9c785..b7d722b 100644 --- a/chirp/anytone.py +++ b/chirp/anytone.py @@ -16,6 +16,7 @@ import os import struct import time +import logging

from chirp import bitwise from chirp import chirp_common @@ -26,6 +27,8 @@ from chirp import util from chirp.settings import RadioSettingGroup, RadioSetting, RadioSettings, \ RadioSettingValueList, RadioSettingValueString, RadioSettingValueBoolean

+LOG = logging.getLogger(__name__) + _mem_format = """ #seekto 0x0100; struct { @@ -164,10 +167,6 @@ def _should_send_addr(memobj, addr): else: return _is_loc_used(memobj, _addr_to_loc(addr))

-def _debug(string): - if "CHIRP_DEBUG" in os.environ or True: - print string - def _echo_write(radio, data): try: radio.pipe.write(data) @@ -201,7 +200,7 @@ def _ident(radio): raise errors.RadioError("Unsupported model") _echo_write(radio, "\x02") response = radio.pipe.read(16) - _debug(util.hexprint(response)) + LOG.debug(util.hexprint(response)) if response[1:8] not in valid_model: print "Response was:\n%s" % util.hexprint(response) raise errors.RadioError("Unsupported model") @@ -227,7 +226,7 @@ def _send(radio, cmd, addr, length, data=None): frame += chr(_checksum(frame[1:])) frame += "\x06" _echo_write(radio, frame) - _debug("Sent:\n%s" % util.hexprint(frame)) + LOG.debug("Sent:\n%s" % util.hexprint(frame)) if data: result = radio.pipe.read(1) if result != "\x06": @@ -236,7 +235,7 @@ def _send(radio, cmd, addr, length, data=None): addr) return result = _read(radio, length + 6) - _debug("Got:\n%s" % util.hexprint(result)) + LOG.debug("Got:\n%s" % util.hexprint(result)) header = result[0:4] data = result[4:-2] ack = result[-1] diff --git a/chirp/baofeng_uv3r.py b/chirp/baofeng_uv3r.py index 52d1a78..0827885 100644 --- a/chirp/baofeng_uv3r.py +++ b/chirp/baofeng_uv3r.py @@ -24,11 +24,6 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueString, \ RadioSettingValueFloat, RadioSettings

-if os.getenv("CHIRP_DEBUG"): - DEBUG = True -else: - DEBUG = False - def _uv3r_prep(radio): radio.pipe.write("\x05PROGRAM") ack = radio.pipe.read(1) diff --git a/chirp/bjuv55.py b/chirp/bjuv55.py index 7dd61be..9fb7e5a 100644 --- a/chirp/bjuv55.py +++ b/chirp/bjuv55.py @@ -28,11 +28,6 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ from textwrap import dedent from chirp import uv5r

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False - BJUV55_MODEL = "\x50\xBB\xDD\x55\x63\x98\x4D"

COLOR_LIST = ["Off", "Blue", "Red", "Pink"] diff --git a/chirp/ft1d.py b/chirp/ft1d.py index eb7a0b1..db0259f 100644 --- a/chirp/ft1d.py +++ b/chirp/ft1d.py @@ -17,6 +17,7 @@ import os import re import string +import logging

from chirp import chirp_common, yaesu_clone, directory from chirp import bitwise @@ -25,6 +26,8 @@ from chirp.settings import RadioSettingValueInteger, RadioSettingValueString from chirp.settings import RadioSettingValueList, RadioSettingValueBoolean from textwrap import dedent

+LOG = logging.getLogger(__name__) + MEM_FORMAT = """ #seekto 0x049a; struct { @@ -1549,8 +1552,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): is_latitude = name.endswith("latitude") lat_long = setting.value.get_value().strip() sign, l_d, l_m, l_s = cls._str_to_latlong(lat_long, is_latitude) - if os.getenv("CHIRP_DEBUG"): - print "%s: %d %d %d %d" % (name, sign, l_d, l_m, l_s) + LOG.debug("%s: %d %d %d %d" % (name, sign, l_d, l_m, l_s)) setattr(obj, "%s_sign" % name, sign) setattr(obj, "%s_degree" % name, l_d) setattr(obj, "%s_minute" % name, l_m) @@ -1587,9 +1589,8 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio):

try: old_val = getattr(obj, setting) - if os.getenv("CHIRP_DEBUG"): - print "Setting %s(%r) <= %s" % ( - element.get_name(), old_val, element.value) + LOG.debug("Setting %s(%r) <= %s" % ( + element.get_name(), old_val, element.value)) setattr(obj, setting, element.value) except AttributeError as e: print "Setting %s is not in the memory map: %s" % ( @@ -1623,4 +1624,4 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = [FT1_DTMF_CHARS.index(x) for x in rawval] for x in range(len(val), 16): val.append(0xFF) - cls._memobj.dtmf[i].memory = val \ No newline at end of file + cls._memobj.dtmf[i].memory = val diff --git a/chirp/ft2800.py b/chirp/ft2800.py index fb9d10c..feac0ce 100644 --- a/chirp/ft2800.py +++ b/chirp/ft2800.py @@ -15,11 +15,12 @@

import time import os +import logging

from chirp import util, memmap, chirp_common, bitwise, directory, errors from chirp.yaesu_clone import YaesuCloneModeRadio

-DEBUG = os.getenv("CHIRP_DEBUG") and True or False +LOG = logging.getLogger(__name__)

CHUNK_SIZE = 16 def _send(s, data): @@ -41,8 +42,7 @@ def _download(radio): if data == IDBLOCK: break

- if DEBUG: - print "Header:\n%s" % util.hexprint(data) + LOG.debug("Header:\n%s" % util.hexprint(data))

if len(data) != 8: raise Exception("Failed to read header") @@ -54,8 +54,7 @@ def _download(radio): while len(data) < radio._block_sizes[1]: time.sleep(0.1) chunk = radio.pipe.read(38) - if DEBUG: - print "Got: %i:\n%s" % (len(chunk), util.hexprint(chunk)) + LOG.debug("Got: %i:\n%s" % (len(chunk), util.hexprint(chunk))) if len(chunk) == 8: print "END?" elif len(chunk) != 38: @@ -79,8 +78,7 @@ def _download(radio): status.msg = "Cloning from radio" radio.status_fn(status)

- if DEBUG: - print "Total: %i" % len(data) + LOG.debug("Total: %i" % len(data))

return memmap.MemoryMap(data)

@@ -94,8 +92,7 @@ def _upload(radio): _send(radio.pipe, IDBLOCK) time.sleep(1) ack = radio.pipe.read(300) - if DEBUG: - print "Ack was (%i):\n%s" % (len(ack), util.hexprint(ack)) + LOG.debug("Ack was (%i):\n%s" % (len(ack), util.hexprint(ack))) if ack != ACK: raise Exception("Radio did not ack ID")

@@ -108,8 +105,7 @@ def _upload(radio): cs += ord(byte) data += chr(cs & 0xFF)

- if DEBUG: - print "Writing block %i:\n%s" % (block, util.hexprint(data)) + LOG.debug("Writing block %i:\n%s" % (block, util.hexprint(data)))

_send(radio.pipe, data) time.sleep(0.1) diff --git a/chirp/ft60.py b/chirp/ft60.py index 45c92d0..74799ef 100644 --- a/chirp/ft60.py +++ b/chirp/ft60.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

-import time, os +import time, os, logging from chirp import chirp_common, yaesu_clone, memmap, bitwise, directory from chirp import errors from chirp.settings import RadioSetting, RadioSettingGroup, \ @@ -22,6 +22,8 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueFloat, RadioSettings from textwrap import dedent

+LOG = logging.getLogger(__name__) + ACK = "\x06"

def _send(pipe, data): @@ -617,8 +619,7 @@ class FT60Radio(yaesu_clone.YaesuCloneModeRadio): obj = getattr(_settings, name) setattr(_settings, name, value)

- if os.getenv("CHIRP_DEBUG"): - print "Setting %s: %s" % (name, value) + LOG.debug("Setting %s: %s" % (name, value)) except Exception, e: print element.get_name() raise diff --git a/chirp/ft7800.py b/chirp/ft7800.py index 451fb08..824bd6d 100644 --- a/chirp/ft7800.py +++ b/chirp/ft7800.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

-import time +import time, logging from chirp import chirp_common, yaesu_clone, memmap, directory from chirp import bitwise, errors from textwrap import dedent @@ -25,10 +25,7 @@ import os, re

from collections import defaultdict

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False +LOG = logging.getLogger(__name__)

ACK = chr(0x06)

@@ -540,9 +537,8 @@ class FT7800Radio(FTx800Radio): FTx800Radio.set_memory(self, memory)

def _decode_chars(self, inarr): - if CHIRP_DEBUG: - print "@_decode_chars, type: %s" % type(inarr) - print inarr + LOG.debug("@_decode_chars, type: %s" % type(inarr)) + LOG.debug(inarr) outstr = "" for i in inarr: if i == 0xFF: @@ -551,9 +547,8 @@ class FT7800Radio(FTx800Radio): return outstr.rstrip()

def _encode_chars(self, instr, length = 16): - if CHIRP_DEBUG: - print "@_encode_chars, type: %s" % type(instr) - print instr + LOG.debug("@_encode_chars, type: %s" % type(instr)) + LOG.debug(instr) outarr = [] instr = str(instr) for i in range(length): @@ -647,8 +642,7 @@ class FT7800Radio(FTx800Radio): break if c < len(DTMFCHARSET): dtmfstr += DTMFCHARSET[c] - if CHIRP_DEBUG: - print dtmfstr + LOG.debug(dtmfstr) dtmfentry = RadioSettingValueString(0, 16, dtmfstr) dtmfentry.set_charset(DTMFCHARSET + list(" ")) rs = RadioSetting(name, name.upper(), dtmfentry) @@ -721,8 +715,7 @@ class FT7800Radio(FTx800Radio): newval.append(DTMFCHARSET.index(dtmfstr[i])) else: newval.append(0xFF) - if CHIRP_DEBUG: - print newval + LOG.debug(newval) idx = int(setting[-2:]) _settings = self._memobj.dtmf[idx] _settings.memory = newval @@ -735,9 +728,7 @@ class FT7800Radio(FTx800Radio): # normal settings newval = element.value oldval = getattr(_settings, setting) - if CHIRP_DEBUG: - print "Setting %s(%s) <= %s" % (setting, - oldval, newval) + LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval)) setattr(_settings, setting, newval) except Exception, e: print element.get_name() diff --git a/chirp/ft817.py b/chirp/ft817.py index 8950f73..c0b42b2 100644 --- a/chirp/ft817.py +++ b/chirp/ft817.py @@ -22,9 +22,11 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ RadioSettings -import time, os +import time, os, logging from textwrap import dedent

+LOG = logging.getLogger(__name__) + CMD_ACK = 0x06

@directory.register @@ -319,8 +321,7 @@ class FT817Radio(yaesu_clone.YaesuCloneModeRadio): raise Exception("Unable to read block %02X expected %i got %i" % (blocknum, block + 2, len(data)))

- if os.getenv("CHIRP_DEBUG"): - print "Read %i" % len(data) + LOG.debug("Read %i" % len(data)) return data

def _clone_in(self): @@ -382,15 +383,12 @@ class FT817Radio(yaesu_clone.YaesuCloneModeRadio): for _i in range(0, repeat): time.sleep(0.01) checksum = yaesu_clone.YaesuChecksum(pos, pos + block - 1) - if os.getenv("CHIRP_DEBUG"): - print "Block %i - will send from %i to %i byte " % \ - (blocks, - pos, - pos + block) - print util.hexprint(chr(blocks)) - print util.hexprint(self.get_mmap()[pos:pos + block]) - print util.hexprint(chr(checksum.get_calculated( - self.get_mmap()))) + LOG.debug("Block %i - will send from %i to %i byte " % \ + (blocks, pos, pos + block)) + LOG.debug(util.hexprint(chr(blocks))) + LOG.debug(util.hexprint(self.get_mmap()[pos:pos + block])) + LOG.debug(util.hexprint(chr(checksum.get_calculated( + self.get_mmap())))) self.pipe.write(chr(blocks)) self.pipe.write(self.get_mmap()[pos:pos + block]) self.pipe.write(chr(checksum.get_calculated(self.get_mmap()))) @@ -399,8 +397,7 @@ class FT817Radio(yaesu_clone.YaesuCloneModeRadio): time.sleep(delay) buf = self.pipe.read(1) if not buf or buf[0] != chr(CMD_ACK): - if os.getenv("CHIRP_DEBUG"): - print util.hexprint(buf) + LOG.debug(util.hexprint(buf)) raise Exception(_("Radio did not ack block %i") % blocks) pos += block blocks += 1 @@ -1030,9 +1027,11 @@ class FT817Radio(yaesu_clone.YaesuCloneModeRadio): else: obj = _settings setting = element.get_name() - if os.getenv("CHIRP_DEBUG"): - print "Setting %s(%s) <= %s" % (setting, - getattr(obj, setting), element.value) + try: + LOG.debug("Setting %s(%s) <= %s" % (setting, + getattr(obj, setting), element.value)) + except AttributeError: + LOG.debug("Setting %s <= %s" % (setting, element.value)) if setting == "contrast": setattr(obj, setting, int(element.value) + 1) elif setting == "callsign": diff --git a/chirp/ft857.py b/chirp/ft857.py index a479623..940c62d 100644 --- a/chirp/ft857.py +++ b/chirp/ft857.py @@ -21,9 +21,11 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ RadioSettings -import os +import os, logging from textwrap import dedent

+LOG = logging.getLogger(__name__) + @directory.register class FT857Radio(ft817.FT817Radio): """Yaesu FT-857/897""" @@ -956,9 +958,11 @@ class FT857Radio(ft817.FT817Radio): else: obj = _settings setting = element.get_name() - if os.getenv("CHIRP_DEBUG"): - print "Setting %s(%s) <= %s" % (setting, - getattr(obj, setting), element.value) + try: + LOG.debug("Setting %s(%s) <= %s" % (setting, + getattr(obj, setting), element.value)) + except AttributeError: + LOG.debug("Setting %s <= %s" % (setting, element.value)) if setting == "arts_idw": self._memobj.arts_idw = \ [self._CALLSIGN_CHARSET_REV[x] for x in diff --git a/chirp/ft90.py b/chirp/ft90.py index bfbddda..b638d47 100644 --- a/chirp/ft90.py +++ b/chirp/ft90.py @@ -19,13 +19,10 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ RadioSettings -import time, os, traceback, string, re +import time, os, traceback, string, re, logging from textwrap import dedent

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG=False +LOG = logging.getLogger(__name__)

CMD_ACK = chr(0x06)

@@ -289,27 +286,24 @@ class FT90Radio(yaesu_clone.YaesuCloneModeRadio): blocknumbyte = chr(blocknum) payloadbytes = self.get_mmap()[pos:pos+blocksize] checksumbyte = chr(checksum.get_calculated(self.get_mmap())) - if CHIRP_DEBUG: - print "Block %i - will send from %i to %i byte " % \ - (blocknum, pos, pos + blocksize) - print util.hexprint(blocknumbyte) - print util.hexprint(payloadbytes) - print util.hexprint(checksumbyte) + LOG.debug("Block %i - will send from %i to %i byte " % \ + (blocknum, pos, pos + blocksize)) + LOG.debug(util.hexprint(blocknumbyte)) + LOG.debug(util.hexprint(payloadbytes)) + LOG.debug(util.hexprint(checksumbyte)) # send wrapped bytes time.sleep(looppredelay) self.pipe.write(blocknumbyte) self.pipe.write(payloadbytes) self.pipe.write(checksumbyte) tmp = self.pipe.read(blocksize+2) #chew echo - if CHIRP_DEBUG: - print "bytes echoed: " - print util.hexprint(tmp) + LOG.debug("bytes echoed: ") + LOG.debug(util.hexprint(tmp)) # radio is slow to write/ack: time.sleep(looppostdelay) buf = self.pipe.read(1) - if CHIRP_DEBUG: - print "ack recd:" - print util.hexprint(buf) + LOG.debug("ack recd:") + LOG.debug(util.hexprint(buf)) if buf != CMD_ACK: raise Exception("Radio did not ack block %i" % blocknum) pos += blocksize @@ -463,12 +457,10 @@ class FT90Radio(yaesu_clone.YaesuCloneModeRadio):

def _decode_cwid(self, cwidarr): cwid = "" - if CHIRP_DEBUG: - print "@ +_decode_cwid:" + LOG.debug("@ +_decode_cwid:") for byte in cwidarr.get_value(): char = int(byte) - if CHIRP_DEBUG: - print char + LOG.debug(char) # bitwise wraps in quotes! get rid of those if char < len(FT90_CWID_CHARS): cwid += FT90_CWID_CHARS[char] @@ -476,21 +468,17 @@ class FT90Radio(yaesu_clone.YaesuCloneModeRadio):

def _encode_cwid(self, cwidarr): cwid = "" - if CHIRP_DEBUG: - print "@ _encode_cwid:" + LOG.debug("@ _encode_cwid:") for char in cwidarr.get_value(): cwid += chr(FT90_CWID_CHARS.index(char)) - if CHIRP_DEBUG: - print cwid + LOG.debug(cwid) return cwid

def _bbcd2dtmf(self, bcdarr, strlen = 16): # doing bbcd, but with support for ABCD*# - if CHIRP_DEBUG: - print bcdarr.get_value() + LOG.debug(bcdarr.get_value()) string = ''.join("%02X" % b for b in bcdarr) - if CHIRP_DEBUG: - print "@_bbcd2dtmf, received: %s" % string + LOG.debug("@_bbcd2dtmf, received: %s" % string) string = string.replace('E','*').replace('F','#') if strlen <= 16: string = string[:strlen] @@ -501,8 +489,7 @@ class FT90Radio(yaesu_clone.YaesuCloneModeRadio): dtmfstr = dtmfstr.replace('*', 'E').replace('#', 'F') dtmfstr = str.ljust(dtmfstr.strip(), 16, "0" ) bcdarr = list(bytearray.fromhex(dtmfstr)) - if CHIRP_DEBUG: - print "@_dtmf2bbcd, sending: %s" % bcdarr + LOG.debug("@_dtmf2bbcd, sending: %s" % bcdarr) return bcdarr

def get_settings(self): @@ -644,9 +631,7 @@ class FT90Radio(yaesu_clone.YaesuCloneModeRadio): dtmfstrlen = len(str(newval).strip()) setattr(_settings, setting + "_len", dtmfstrlen) newval = self._dtmf2bbcd(newval) - if CHIRP_DEBUG: - print "Setting %s(%s) <= %s" % (setting, - oldval, newval) + LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval)) setattr(_settings, setting, newval) except Exception, e: print element.get_name() diff --git a/chirp/ftm350.py b/chirp/ftm350.py index 442cde1..e3fcbfe 100644 --- a/chirp/ftm350.py +++ b/chirp/ftm350.py @@ -16,12 +16,15 @@ import time import struct import os +import logging

from chirp import chirp_common, yaesu_clone, directory, errors, util from chirp import bitwise, memmap from chirp.settings import RadioSettingGroup, RadioSetting, RadioSettings from chirp.settings import RadioSettingValueInteger, RadioSettingValueString

+LOG = logging.getLogger(__name__) + mem_format = """ struct mem { u8 used:1, @@ -141,8 +144,8 @@ def _clone_in(radio): radio.pipe.write("\x06") time.sleep(0.05)

- if os.getenv("CHIRP_DEBUG") and (last_addr + 128) != addr: - print "Gap, expecting %04x, got %04x" % (last_addr+128, addr) + if (last_addr + 128) != addr: + LOG.debug("Gap, expecting %04x, got %04x" % (last_addr+128, addr)) last_addr = addr data[addr] = block length += len(block) diff --git a/chirp/h777.py b/chirp/h777.py index bce4b98..5ac0351 100644 --- a/chirp/h777.py +++ b/chirp/h777.py @@ -18,6 +18,7 @@ import time import os import struct import unittest +import logging

from chirp import chirp_common, directory, memmap from chirp import bitwise, errors, util @@ -25,7 +26,7 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettings

-DEBUG = os.getenv("CHIRP_DEBUG") and True or False +LOG = logging.getLogger(__name__)

MEM_FORMAT = """ #seekto 0x0010; @@ -139,8 +140,7 @@ def _h777_read_block(radio, block_addr, block_size):

cmd = struct.pack(">cHb", 'R', block_addr, BLOCK_SIZE) expectedresponse = "W" + cmd[1:] - if DEBUG: - print("Reading block %04x..." % (block_addr)) + LOG.debug("Reading block %04x..." % (block_addr))

try: serial.write(cmd) @@ -166,9 +166,8 @@ def _h777_write_block(radio, block_addr, block_size): cmd = struct.pack(">cHb", 'W', block_addr, BLOCK_SIZE) data = radio.get_mmap()[block_addr:block_addr + 8]

- if DEBUG: - print("Writing Data:") - print util.hexprint(cmd + data) + LOG.debug("Writing Data:") + LOG.debug(util.hexprint(cmd + data))

try: serial.write(cmd + data) @@ -197,9 +196,8 @@ def do_download(radio): block = _h777_read_block(radio, addr, BLOCK_SIZE) data += block

- if DEBUG: - print "Address: %04x" % addr - print util.hexprint(block) + LOG.debug("Address: %04x" % addr) + LOG.debug(util.hexprint(block))

_h777_exit_programming_mode(radio)

diff --git a/chirp/icomciv.py b/chirp/icomciv.py index 71af300..1d02553 100644 --- a/chirp/icomciv.py +++ b/chirp/icomciv.py @@ -1,9 +1,9 @@

-import struct +import struct, logging from chirp import chirp_common, icf, util, errors, bitwise, directory from chirp.memmap import MemoryMap

-DEBUG = True +LOG = logging.getLogger(__name__)

MEM_FORMAT = """ bbcd number[2]; @@ -80,9 +80,8 @@ class Frame: raw = struct.pack("BBBBBB", 0xFE, 0xFE, src, dst, self._cmd, self._sub) raw += str(self._data) + chr(0xFD)

- if DEBUG: - print "%02x -> %02x (%i):\n%s" % (src, dst, - len(raw), util.hexprint(raw)) + LOG.debug("%02x -> %02x (%i):\n%s" % (src, dst, + len(raw), util.hexprint(raw)))

serial.write(raw) if willecho: @@ -106,8 +105,7 @@ class Frame: raise errors.RadioError("Radio reported error")

src, dst = struct.unpack("BB", data[2:4]) - if DEBUG: - print "%02x <- %02x:\n%s" % (src, dst, util.hexprint(data)) + LOG.debug("%02x <- %02x:\n%s" % (src, dst, util.hexprint(data)))

self._cmd = ord(data[4]) self._sub = ord(data[5]) diff --git a/chirp/idrp.py b/chirp/idrp.py index e20ba07..012bb46 100644 --- a/chirp/idrp.py +++ b/chirp/idrp.py @@ -13,12 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

-import serial +import serial, logging

-from chirp import chirp_common, errors -from chirp import util +from chirp import chirp_common, errors, util

-DEBUG_IDRP = False +LOG = logging.getLogger(__name__)

def parse_frames(buf): """Parse frames from the radio""" @@ -49,8 +48,7 @@ def send(pipe, buf): break

data += buf - if DEBUG_IDRP: - print "Got: \n%s" % util.hexprint(buf) + LOG.debug("Got: \n%s" % util.hexprint(buf))

return parse_frames(data)

@@ -97,8 +95,7 @@ def get_freq(pipe): ord(els[2]), ord(els[1]), ord(els[0]))) - if DEBUG_IDRP: - print "Freq: %f" % freq + LOG.debug("Freq: %f" % freq) return freq

raise errors.InvalidDataError("No frequency frame received") diff --git a/chirp/kenwood_live.py b/chirp/kenwood_live.py index 971c08e..6cac1c9 100644 --- a/chirp/kenwood_live.py +++ b/chirp/kenwood_live.py @@ -17,6 +17,9 @@ import threading import os import sys import time +import logging + +LOG = logging.getLogger(__name__)

NOCACHE = os.environ.has_key("CHIRP_NOCACHE")

@@ -29,8 +32,6 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueBoolean, \ RadioSettingValueString, RadioSettingValueList, RadioSettings

-DEBUG = True - DUPLEX = { 0 : "", 1 : "+", 2 : "-" } MODES = { 0 : "FM", 1 : "AM" } STEPS = list(chirp_common.TUNING_STEPS) @@ -49,8 +50,7 @@ def command(ser, cmd, *args): LOCK.acquire() if args: cmd += " " + " ".join(args) - if DEBUG: - print "PC->RADIO: %s" % cmd + LOG.debug("PC->RADIO: %s" % cmd) ser.write(cmd + "\r")

result = "" @@ -60,8 +60,7 @@ def command(ser, cmd, *args): print "Timeout waiting for data" break

- if DEBUG: - print "D7->PC: %s" % result.strip() + LOG.debug("D7->PC: %s" % result.strip())

LOCK.release()

diff --git a/chirp/kguv8d.py b/chirp/kguv8d.py index 772b04f..d0f779f 100644 --- a/chirp/kguv8d.py +++ b/chirp/kguv8d.py @@ -17,16 +17,14 @@

import time import os +import logging from chirp import util, chirp_common, bitwise, memmap, errors, directory from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueList, \ RadioSettingValueInteger, RadioSettingValueString, \ RadioSettings

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False +LOG = logging.getLogger(__name__)

CMD_ID = 128 CMD_END = 129 @@ -304,8 +302,7 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, _packet += payload # calculate and add the checksum to the packet _packet += chr(self._checksum(_packet[1:])) - if CHIRP_DEBUG: - print "Sent:\n%s" % util.hexprint(_packet) + LOG.debug("Sent:\n%s" % util.hexprint(_packet)) self.pipe.write(_packet)

def _read_record(self): @@ -317,9 +314,8 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, _cs += self._checksum(_packet) _cs %= 256 _rcs = ord(self.pipe.read(1)) - if CHIRP_DEBUG: - print "_cs =", _cs - print "_rcs=", _rcs + LOG.debug("_cs =", _cs) + LOG.debug("_rcs=", _rcs) return (_rcs != _cs, _packet)

# Identify the radio @@ -350,14 +346,12 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, for _i in range(0, 10): self._write_record(CMD_ID) _chksum_err, _resp = self._read_record() - if CHIRP_DEBUG: - print "Got:\n%s" % util.hexprint(_resp) + LOG.debug("Got:\n%s" % util.hexprint(_resp)) if _chksum_err: print "Checksum error: retrying ident..." time.sleep(0.100) continue - if CHIRP_DEBUG: - print "Model %s" % util.hexprint(_resp[0:7]) + LOG.debug("Model %s" % util.hexprint(_resp[0:7])) if _resp[0:7] == self._model: return if len(_resp) == 0: @@ -407,8 +401,7 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, # TODO: probably should retry a few times here print util.hexprint(resp) raise Exception("Checksum error on read") - if CHIRP_DEBUG: - print "Got:\n%s" % util.hexprint(resp) + LOG.debug("Got:\n%s" % util.hexprint(resp)) image += resp[2:] if self.status_fn: status = chirp_common.Status() @@ -436,11 +429,9 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, req = chr(i / 256) + chr(i % 256) chunk = self.get_mmap()[ptr:ptr + blocksize] self._write_record(CMD_WR, req + chunk) - if CHIRP_DEBUG: - print util.hexprint(req + chunk) + LOG.debug(util.hexprint(req + chunk)) cserr, ack = self._read_record() - if CHIRP_DEBUG: - print util.hexprint(ack) + LOG.debug(util.hexprint(ack)) j = ord(ack[0]) * 256 + ord(ack[1]) if cserr or j != ptr: raise Exception("Radio did not ack block %i" % ptr) @@ -537,9 +528,8 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, # always set it even if no dtcs is used mem.dtcs_polarity = "%s%s" % (tpol or "N", rpol or "N")

- if os.getenv("CHIRP_DEBUG"): - print "Got TX %s (%i) RX %s (%i)" % (txmode, _mem.txtone, - rxmode, _mem.rxtone) + LOG.debug("Got TX %s (%i) RX %s (%i)" % (txmode, _mem.txtone, + rxmode, _mem.rxtone))

def get_memory(self, number): _mem = self._memobj.memory[number] @@ -549,8 +539,7 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, mem.number = number _valid = self._memobj.valid[mem.number]

- if CHIRP_DEBUG: - print number, _valid == MEM_VALID + LOG.debug("%d %s", number, _valid == MEM_VALID) if _valid != MEM_VALID: mem.empty = True return mem @@ -618,9 +607,8 @@ class KGUV8DRadio(chirp_common.CloneModeRadio, else: _mem.rxtone = 0

- if CHIRP_DEBUG: - print "Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.txtone, - rx_mode, _mem.rxtone) + LOG.debug("Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.txtone, + rx_mode, _mem.rxtone))

def set_memory(self, mem): number = mem.number diff --git a/chirp/kyd.py b/chirp/kyd.py index 2d4223d..e188df9 100644 --- a/chirp/kyd.py +++ b/chirp/kyd.py @@ -17,6 +17,7 @@ import time import os import struct +import logging

from chirp import chirp_common, directory, memmap from chirp import bitwise, errors, util @@ -24,7 +25,7 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettings

-DEBUG = os.getenv("CHIRP_DEBUG") and True or False +LOG = logging.getLogger(__name__)

MEM_FORMAT = """ #seekto 0x0010; @@ -132,8 +133,7 @@ def _nc630a_read_block(radio, block_addr, block_size):

cmd = struct.pack(">cHb", 'R', block_addr, BLOCK_SIZE) expectedresponse = "W" + cmd[1:] - if DEBUG: - print("Reading block %04x..." % (block_addr)) + LOG.debug("Reading block %04x..." % (block_addr))

try: serial.write(cmd) @@ -159,9 +159,8 @@ def _nc630a_write_block(radio, block_addr, block_size): cmd = struct.pack(">cHb", 'W', block_addr, BLOCK_SIZE) data = radio.get_mmap()[block_addr:block_addr + 8]

- if DEBUG: - print("Writing Data:") - print util.hexprint(cmd + data) + LOG.debug("Writing Data:") + LOG.debug(util.hexprint(cmd + data))

try: serial.write(cmd + data) @@ -190,9 +189,8 @@ def do_download(radio): block = _nc630a_read_block(radio, addr, BLOCK_SIZE) data += block

- if DEBUG: - print "Address: %04x" % addr - print util.hexprint(block) + LOG.debug("Address: %04x" % addr) + LOG.debug(util.hexprint(block))

_nc630a_exit_programming_mode(radio)

@@ -301,9 +299,8 @@ class NC630aRadio(chirp_common.CloneModeRadio): if mem.tmode == "DTCS": mem.dtcs_polarity = "%s%s" % (tpol, rpol)

- if os.getenv("CHIRP_DEBUG"): - print "Got TX %s (%i) RX %s (%i)" % (txmode, _mem.tx_tone, - rxmode, _mem.rx_tone) + LOG.debug("Got TX %s (%i) RX %s (%i)" % (txmode, _mem.tx_tone, + rxmode, _mem.rx_tone))

def get_memory(self, number): bitpos = (1 << ((number - 1) % 8)) @@ -387,9 +384,8 @@ class NC630aRadio(chirp_common.CloneModeRadio): else: _mem.rx_tone = 0xFFFF

- if os.getenv("CHIRP_DEBUG"): - print "Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.tx_tone, - rx_mode, _mem.rx_tone) + LOG.debug("Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.tx_tone, + rx_mode, _mem.rx_tone))

def set_memory(self, mem): bitpos = (1 << ((mem.number - 1) % 8)) diff --git a/chirp/leixen.py b/chirp/leixen.py index 1977f0c..285fe84 100644 --- a/chirp/leixen.py +++ b/chirp/leixen.py @@ -24,11 +24,6 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueFloat, InvalidValueError, RadioSettings from textwrap import dedent

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False - MEM_FORMAT = """ #seekto 0x0184; struct { diff --git a/chirp/puxing.py b/chirp/puxing.py index 88cbe79..f38b41e 100644 --- a/chirp/puxing.py +++ b/chirp/puxing.py @@ -20,11 +20,6 @@ import os from chirp import util, chirp_common, bitwise, errors, directory from chirp.wouxun_common import wipe_memory, do_download, do_upload

-if os.getenv("CHIRP_DEBUG"): - DEBUG = True -else: - DEBUG = False - def _puxing_prep(radio): radio.pipe.write("\x02PROGRA") ack = radio.pipe.read(1) diff --git a/chirp/th9800.py b/chirp/th9800.py index 3edc310..d1a1b0b 100644 --- a/chirp/th9800.py +++ b/chirp/th9800.py @@ -24,12 +24,10 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ from chirp_common import format_freq import os import time +import logging from datetime import date

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False +LOG = logging.getLogger(__name__)

TH9800_MEM_FORMAT = """ struct mem { @@ -323,8 +321,7 @@ class TYTTH9800Base(chirp_common.Radio): _prev_active = self.get_active("chan_active", mem.number) self.set_active("chan_active", mem.number, not mem.empty) if mem.empty or not _prev_active: - if CHIRP_DEBUG: - print "initializing memory channel %d" % mem.number + LOG.debug("initializing memory channel %d" % mem.number) _mem.set_raw(BLANK_MEMORY)

if mem.empty: @@ -390,8 +387,7 @@ class TYTTH9800Base(chirp_common.Radio): _mem.step = STEPS.index(mem.tuning_step)

for setting in mem.extra: - if CHIRP_DEBUG: - print "@set_mem:", setting.get_name(), setting.value + LOG.debug("@set_mem:", setting.get_name(), setting.value) setattr(_mem, setting.get_name(), setting.value)

def get_settings(self): @@ -559,9 +555,7 @@ class TYTTH9800Base(chirp_common.Radio): oldval = getattr(_settings, setting) newval = element.value

- if CHIRP_DEBUG: - print "Setting %s(%s) <= %s" % (setting, - oldval, newval) + LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval)) setattr(_settings, setting, newval) except Exception, e: print element.get_name() @@ -666,12 +660,12 @@ def _upload(radio, memsize = 0xF400, blocksize = 0x80): m = today.month d = today.day _info = radio._memobj.info - if CHIRP_DEBUG: - ly = _info.prog_yr - lm = _info.prog_mon - ld = _info.prog_day - print "Updating last program date:%d/%d/%d" % (lm,ld,ly) - print " to today:%d/%d/%d" % (m,d,y) + + ly = _info.prog_yr + lm = _info.prog_mon + ld = _info.prog_day + LOG.debug("Updating last program date:%d/%d/%d" % (lm,ld,ly)) + LOG.debug(" to today:%d/%d/%d" % (m,d,y))

_info.prog_yr = y _info.prog_mon = m @@ -680,8 +674,7 @@ def _upload(radio, memsize = 0xF400, blocksize = 0x80): offset = 0x0100 for addr in range(offset, memsize, blocksize): mapaddr = addr + radio._mmap_offset - offset - if CHIRP_DEBUG: - print "addr: 0x%04X, mmapaddr: 0x%04X" % (addr, mapaddr) + LOG.debug("addr: 0x%04X, mmapaddr: 0x%04X" % (addr, mapaddr)) msg = struct.pack(">cHB", "W", addr, blocksize) msg += radio._mmap[mapaddr:(mapaddr + blocksize)] print util.hexprint(msg) @@ -703,8 +696,7 @@ def _upload(radio, memsize = 0xF400, blocksize = 0x80):

# Checksum? final_data = radio.pipe.read(3) - if CHIRP_DEBUG: - print "final:", util.hexprint(final_data) + LOG.debug("final:", util.hexprint(final_data))

@directory.register class TYTTH9800Radio(TYTTH9800Base, chirp_common.CloneModeRadio, diff --git a/chirp/th_uv3r.py b/chirp/th_uv3r.py index 5e3e2c0..3b670fe 100644 --- a/chirp/th_uv3r.py +++ b/chirp/th_uv3r.py @@ -19,11 +19,6 @@ import os from chirp import chirp_common, bitwise, errors, directory from chirp.wouxun_common import do_download, do_upload

-if os.getenv("CHIRP_DEBUG"): - DEBUG = True -else: - DEBUG = False - def tyt_uv3r_prep(radio): try: radio.pipe.write("PROGRAMa") diff --git a/chirp/thd72.py b/chirp/thd72.py index 0d80adc..aa414de 100644 --- a/chirp/thd72.py +++ b/chirp/thd72.py @@ -15,9 +15,9 @@

from chirp import chirp_common, errors, util, directory from chirp import bitwise, memmap -import time, struct, sys +import time, struct, sys, logging

-DEBUG = True +LOG = logging.getLogger(__name__)

# TH-D72 memory map # 0x0000..0x0200: startup password and other stuff @@ -452,13 +452,11 @@ class THD72Radio(chirp_common.CloneModeRadio): start = time.time()

data = "" - if DEBUG: - print "PC->D72: %s" % cmd + LOG.debug("PC->D72: %s" % cmd) self.pipe.write(cmd + "\r") while not data.endswith("\r") and (time.time() - start) < timeout: data += self.pipe.read(1) - if DEBUG: - print "D72->PC: %s" % data.strip() + LOG.debug("D72->PC: %s" % data.strip()) return data.strip()

def get_id(self): diff --git a/chirp/tk8102.py b/chirp/tk8102.py index 32e8621..4cf291e 100644 --- a/chirp/tk8102.py +++ b/chirp/tk8102.py @@ -15,6 +15,7 @@

import struct import os +import logging

from chirp import chirp_common, directory, memmap, errors, util from chirp import bitwise @@ -22,6 +23,8 @@ from chirp.settings import RadioSettingGroup, RadioSetting from chirp.settings import RadioSettingValueBoolean, RadioSettingValueList from chirp.settings import RadioSettingValueString, RadioSettings

+LOG = logging.getLogger(__name__) + MEM_FORMAT = """ #seekto 0x0030; struct { @@ -317,9 +320,8 @@ class KenwoodTKx102Radio(chirp_common.CloneModeRadio): else: _mem.rx_tone = 0xFFFF

- if os.getenv("CHIRP_DEBUG"): - print "Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.tx_tone, - rx_mode, _mem.rx_tone) + LOG.debug("Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.tx_tone, + rx_mode, _mem.rx_tone)) def set_memory(self, mem): _mem = self._memobj.memory[mem.number - 1]

diff --git a/chirp/tmv71_ll.py b/chirp/tmv71_ll.py index dac7f36..201412e 100644 --- a/chirp/tmv71_ll.py +++ b/chirp/tmv71_ll.py @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

-import struct, time +import struct, time, logging

from chirp import memmap, chirp_common, errors

-DEBUG = True +LOG = logging.getLogger(__name__)

POS_MODE = 5 POS_DUP = 6 @@ -50,13 +50,11 @@ def command(s, cmd, timeout=0.5): start = time.time()

data = "" - if DEBUG: - print "PC->V71: %s" % cmd + LOG.debug("PC->V71: %s" % cmd) s.write(cmd + "\r") while not data.endswith("\r") and (time.time() - start) < timeout: data += s.read(1) - if DEBUG: - print "V71->PC: %s" % data.strip() + LOG.debug("V71->PC: %s" % data.strip()) return data.strip()

def get_id(s): diff --git a/chirp/uv5r.py b/chirp/uv5r.py index 6fcbae1..646d6e2 100644 --- a/chirp/uv5r.py +++ b/chirp/uv5r.py @@ -16,6 +16,7 @@ import struct import time import os +import logging

from chirp import chirp_common, errors, util, directory, memmap from chirp import bitwise @@ -25,10 +26,7 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueFloat, InvalidValueError, RadioSettings from textwrap import dedent

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False +LOG = logging.getLogger(__name__)

MEM_FORMAT = """ #seekto 0x0008; @@ -394,8 +392,7 @@ def _firmware_version_from_image(radio): version = _firmware_version_from_data(radio.get_mmap(), radio._fw_ver_file_start, radio._fw_ver_file_stop) - if CHIRP_DEBUG: - print "_firmware_version_from_image: " + util.hexprint(version) + LOG.debug("_firmware_version_from_image: " + util.hexprint(version)) return version

def _special_block_from_data(data, special_block_start, special_block_stop): @@ -404,8 +401,7 @@ def _special_block_from_data(data, special_block_start, special_block_stop):

def _special_block_from_image(radio): special_block = _special_block_from_data(radio.get_mmap(), 0x0CFA, 0x0D01) - if CHIRP_DEBUG: - print "_special_block_from_image: " + util.hexprint(special_block) + LOG.debug("_special_block_from_image: " + util.hexprint(special_block)) return special_block

def _do_ident(radio, magic): @@ -504,19 +500,16 @@ def _do_download(radio): raise errors.RadioError("Incorrect 'Model' selected.")

# Main block - if CHIRP_DEBUG: - print "downloading main block..." + LOG.debug("downloading main block...") for i in range(0, 0x1800, 0x40): data += _read_block(radio, i, 0x40) _do_status(radio, i) - if CHIRP_DEBUG: - print "done." - print "downloading aux block..." + LOG.debug("done.") + LOG.debug("downloading aux block...") # Auxiliary block starts at 0x1ECO (?) for i in range(0x1EC0, 0x2000, 0x40): data += _read_block(radio, i, 0x40) - if CHIRP_DEBUG: - print "done." + LOG.debug("done.") return memmap.MemoryMap(data)

def _send_block(radio, addr, data): @@ -916,8 +909,7 @@ class BaofengUV5R(chirp_common.CloneModeRadio,

def _is_orig(self): version_tag = _firmware_version_from_image(self) - if CHIRP_DEBUG: - print "@_is_orig, version_tag:", util.hexprint(version_tag) + LOG.debug("@_is_orig, version_tag: %s", util.hexprint(version_tag)) try: if 'BFB' in version_tag: idx = version_tag.index("BFB") + 3 diff --git a/chirp/vx170.py b/chirp/vx170.py index 20aac04..eaa7dbc 100644 --- a/chirp/vx170.py +++ b/chirp/vx170.py @@ -19,11 +19,6 @@ from textwrap import dedent import time, os from chirp import ft7800

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False - MEM_FORMAT = """ #seekto 0x018A; struct { diff --git a/chirp/vx2.py b/chirp/vx2.py index 3156806..6c6b912 100644 --- a/chirp/vx2.py +++ b/chirp/vx2.py @@ -19,12 +19,9 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ RadioSettings -import os, traceback, re +import os, traceback, re, logging

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False +LOG = logging.getLogger(__name__)

MEM_FORMAT = """ #seekto 0x7F52; @@ -410,9 +407,8 @@ class VX2Radio(yaesu_clone.YaesuCloneModeRadio): return VX2BankModel(self)

def _decode_chars(self, inarr): - if CHIRP_DEBUG: - print "@_decode_chars, type: %s" % type(inarr) - print inarr + LOG.debug("@_decode_chars, type: %s" % type(inarr)) + LOG.debug(inarr) outstr = "" for i in inarr: if i == 0xFF: @@ -421,9 +417,8 @@ class VX2Radio(yaesu_clone.YaesuCloneModeRadio): return outstr.rstrip()

def _encode_chars(self, instr, length = 16): - if CHIRP_DEBUG: - print "@_encode_chars, type: %s" % type(instr) - print instr + LOG.debug("@_encode_chars, type: %s" % type(instr)) + LOG.debug(instr) outarr = [] instr = str(instr) for i in range(0, length): @@ -648,8 +643,7 @@ class VX2Radio(yaesu_clone.YaesuCloneModeRadio): for c in dtmfsetting.digits: if c < len(DTMFCHARSET): dtmfstr += DTMFCHARSET[c] - if CHIRP_DEBUG: - print dtmfstr + LOG.debug(dtmfstr) dtmfentry = RadioSettingValueString(0, 16, dtmfstr) dtmfentry.set_charset(DTMFCHARSET + list(" ")) rs = RadioSetting(name, name.upper(), dtmfentry) @@ -676,8 +670,7 @@ class VX2Radio(yaesu_clone.YaesuCloneModeRadio): newval.append(DTMFCHARSET.index(dtmfstr[i])) else: newval.append(0xFF) - if CHIRP_DEBUG: - print newval + LOG.debug(newval) idx = int(setting[-1:]) - 1 _settings = self._memobj.dtmf[idx] _settings.digits = newval @@ -698,12 +691,10 @@ class VX2Radio(yaesu_clone.YaesuCloneModeRadio): newval = self._encode_chars(newval) if setting == "openmsg": newval = self._encode_chars(newval, 6) - if CHIRP_DEBUG: - print "Setting %s(%s) <= %s" % (setting, - oldval, newval) + LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval)) setattr(_settings, setting, newval) except Exception, e: print element.get_name() raise

- \ No newline at end of file + diff --git a/chirp/vx3.py b/chirp/vx3.py index 99d0951..0575a46 100644 --- a/chirp/vx3.py +++ b/chirp/vx3.py @@ -21,7 +21,9 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueString, \ RadioSettings from textwrap import dedent -import os, re +import os, re, logging + +LOG = logging.getLogger(__name__)

#interesting offsets which may be checksums needed later #0x0393 checksum1? @@ -29,11 +31,6 @@ import os, re #0x0409 checksum2? #0x04C9 checksum2a?

-if os.getenv("CHIRP_DEBUG"): - CHIRP_DEBUG = True -else: - CHIRP_DEBUG = False - MEM_FORMAT = """ #seekto 0x7F4A; u8 checksum; @@ -499,9 +496,8 @@ class VX3Radio(yaesu_clone.YaesuCloneModeRadio): return VX3BankModel(self)

def _decode_chars(self, inarr): - if CHIRP_DEBUG: - print "@_decode_chars, type: %s" % type(inarr) - print inarr + LOG.debug("@_decode_chars, type: %s" % type(inarr)) + LOG.debug(inarr) outstr = "" for i in inarr: if i == 0xFF: @@ -510,9 +506,8 @@ class VX3Radio(yaesu_clone.YaesuCloneModeRadio): return outstr.rstrip()

def _encode_chars(self, instr, length = 16): - if CHIRP_DEBUG: - print "@_encode_chars, type: %s" % type(instr) - print instr + LOG.debug("@_encode_chars, type: %s" % type(instr)) + LOG.debug(instr) outarr = [] instr = str(instr) for i in range(length): @@ -785,8 +780,7 @@ class VX3Radio(yaesu_clone.YaesuCloneModeRadio): for c in dtmfsetting.memory: if c < len(DTMFCHARSET): dtmfstr += DTMFCHARSET[c] - if CHIRP_DEBUG: - print dtmfstr + LOG.debug(dtmfstr) dtmfentry = RadioSettingValueString(0, 16, dtmfstr) dtmfentry.set_charset(DTMFCHARSET + list(" ")) rs = RadioSetting(name, name.upper(), dtmfentry) @@ -861,8 +855,7 @@ class VX3Radio(yaesu_clone.YaesuCloneModeRadio): newval.append(DTMFCHARSET.index(dtmfstr[i])) else: newval.append(0xFF) - if CHIRP_DEBUG: - print newval + LOG.debug(newval) idx = int(setting[-1:]) _settings = self._memobj.dtmf[idx] _settings.memory = newval @@ -885,11 +878,9 @@ class VX3Radio(yaesu_clone.YaesuCloneModeRadio): newval = self._encode_chars(newval) if setting == "openmsg": newval = self._encode_chars(newval, 6) - if CHIRP_DEBUG: - print "Setting %s(%s) <= %s" % (setting, - oldval, newval) + LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval)) setattr(_settings, setting, newval) except Exception, e: print element.get_name() raise - \ No newline at end of file + diff --git a/chirp/vx8.py b/chirp/vx8.py index 02490a1..45fff7a 100644 --- a/chirp/vx8.py +++ b/chirp/vx8.py @@ -15,6 +15,7 @@

import os import re +import logging

from chirp import chirp_common, yaesu_clone, directory from chirp import bitwise @@ -23,6 +24,8 @@ from chirp.settings import RadioSettingValueInteger, RadioSettingValueString from chirp.settings import RadioSettingValueList, RadioSettingValueBoolean from textwrap import dedent

+LOG = logging.getLogger(__name__) + MEM_FORMAT = """ #seekto 0x047f; struct { @@ -1461,8 +1464,7 @@ class VX8DRadio(VX8Radio): is_latitude = name.endswith("latitude") lat_long = setting.value.get_value().strip() sign, l_d, l_m, l_s = cls._str_to_latlong(lat_long, is_latitude) - if os.getenv("CHIRP_DEBUG"): - print "%s: %d %d %d %d" % (name, sign, l_d, l_m, l_s) + LOG.debug("%s: %d %d %d %d" % (name, sign, l_d, l_m, l_s)) setattr(obj, "%s_sign" % name, sign) setattr(obj, "%s_degree" % name, l_d) setattr(obj, "%s_minute" % name, l_m) @@ -1499,9 +1501,8 @@ class VX8DRadio(VX8Radio):

try: old_val = getattr(obj, setting) - if os.getenv("CHIRP_DEBUG"): - print "Setting %s(%r) <= %s" % ( - element.get_name(), old_val, element.value) + LOG.debug("Setting %s(%r) <= %s" % ( + element.get_name(), old_val, element.value)) setattr(obj, setting, element.value) except AttributeError as e: print "Setting %s is not in the memory map: %s" % ( diff --git a/chirp/wouxun.py b/chirp/wouxun.py index 6feec42..4a3dd0b 100644 --- a/chirp/wouxun.py +++ b/chirp/wouxun.py @@ -17,6 +17,7 @@

import time import os +import logging from chirp import util, chirp_common, bitwise, memmap, errors, directory from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueList, \ @@ -25,6 +26,8 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ from chirp.wouxun_common import wipe_memory, do_download, do_upload from textwrap import dedent

+LOG = logging.getLogger(__name__) + FREQ_ENCODE_TABLE = [ 0x7, 0xa, 0x0, 0x9, 0xb, 0x2, 0xe, 0x1, 0x3, 0xf ]

def encode_freq(freq): @@ -717,9 +720,8 @@ class KGUVD1PRadio(chirp_common.CloneModeRadio, # always set it even if no dtcs is used mem.dtcs_polarity = "%s%s" % (tpol or "N", rpol or "N")

- if os.getenv("CHIRP_DEBUG"): - print "Got TX %s (%i) RX %s (%i)" % (txmode, _mem.tx_tone, - rxmode, _mem.rx_tone) + LOG.debug("Got TX %s (%i) RX %s (%i)" % (txmode, _mem.tx_tone, + rxmode, _mem.rx_tone))

def _is_txinh(self, _mem): raw_tx = "" @@ -817,9 +819,8 @@ class KGUVD1PRadio(chirp_common.CloneModeRadio, else: _mem.rx_tone = 0xFFFF

- if os.getenv("CHIRP_DEBUG"): - print "Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.tx_tone, - rx_mode, _mem.rx_tone) + LOG.debug("Set TX %s (%i) RX %s (%i)" % (tx_mode, _mem.tx_tone, + rx_mode, _mem.rx_tone))

def set_memory(self, mem): _mem = self._memobj.memory[mem.number - 1] diff --git a/chirp/wouxun_common.py b/chirp/wouxun_common.py index 3c78b3a..5b51e93 100644 --- a/chirp/wouxun_common.py +++ b/chirp/wouxun_common.py @@ -18,8 +18,11 @@

import struct import os +import logging from chirp import util, chirp_common, memmap

+LOG = logging.getLogger(__name__) + def wipe_memory(_mem, byte): """Cleanup a memory""" _mem.set_raw(byte * (_mem.size() / 8)) @@ -29,8 +32,7 @@ def do_download(radio, start, end, blocksize): image = "" for i in range(start, end, blocksize): cmd = struct.pack(">cHb", "R", i, blocksize) - if os.getenv("CHIRP_DEBUG"): - print util.hexprint(cmd) + LOG.debug(util.hexprint(cmd)) radio.pipe.write(cmd) length = len(cmd) + blocksize resp = radio.pipe.read(length) @@ -61,8 +63,7 @@ def do_upload(radio, start, end, blocksize): chunk = radio.get_mmap()[ptr:ptr+blocksize] ptr += blocksize radio.pipe.write(cmd + chunk) - if os.getenv("CHIRP_DEBUG"): - print util.hexprint(cmd + chunk) + LOG.debug(util.hexprint(cmd + chunk))

ack = radio.pipe.read(1) if not ack == "\x06": diff --git a/chirp/yaesu_clone.py b/chirp/yaesu_clone.py index 57958c3..e8ec732 100644 --- a/chirp/yaesu_clone.py +++ b/chirp/yaesu_clone.py @@ -16,9 +16,11 @@ CMD_ACK = 0x06

from chirp import chirp_common, util, memmap, errors -import time, os +import time, os, logging from textwrap import dedent

+LOG = logging.getLogger(__name__) + def _safe_read(pipe, count): buf = "" first = True @@ -49,8 +51,7 @@ def _chunk_read(pipe, count, status_fn): status.max = count status.cur = len(data) status_fn(status) - if os.getenv("CHIRP_DEBUG"): - print "Read %i/%i" % (len(data), count) + LOG.debug("Read %i/%i" % (len(data), count)) return data

def __clone_in(radio): @@ -91,8 +92,7 @@ def _chunk_write(pipe, data, status_fn, block): chunk = data[i:i+block] pipe.write(chunk) count += len(chunk) - if os.getenv("CHIRP_DEBUG"): - print "@_chunk_write, count: %i, blocksize: %i" % (count,block) + LOG.debug("@_chunk_write, count: %i, blocksize: %i" % (count,block)) time.sleep(delay)

status = chirp_common.Status() @@ -120,8 +120,7 @@ def __clone_out(radio): for block in radio._block_lengths: blocks += 1 if blocks != len(radio._block_lengths): - if os.getenv("CHIRP_DEBUG"): - print "Sending %i-%i" % (pos, pos+block) + LOG.debug("Sending %i-%i" % (pos, pos+block)) pipe.write(radio.get_mmap()[pos:pos+block]) buf = pipe.read(1) if buf and buf[0] != chr(CMD_ACK): diff --git a/chirpui/reporting.py b/chirpui/reporting.py index c48c6bb..efe18c1 100644 --- a/chirpui/reporting.py +++ b/chirpui/reporting.py @@ -28,16 +28,18 @@ import threading import os import time +import logging

from chirp import CHIRP_VERSION, platform

REPORT_URL = "http://chirp.danplanet.com/report/report.php?do_report" ENABLED = True -DEBUG = os.getenv("CHIRP_DEBUG") == "y" THREAD_SEM = threading.Semaphore(10) # Maximum number of outstanding threads LAST = 0 LAST_TYPE = None

+LOG = logging.getLogger(__name__) + try: # Don't let failure to import any of these modules cause trouble from chirpui import config @@ -45,18 +47,14 @@ try: except: ENABLED = False

-def debug(string): - if DEBUG: - print string - def should_report(): if not ENABLED: - debug("Not reporting due to recent failure") + LOG.debug("Not reporting due to recent failure") return False

conf = config.get() if conf.get_bool("no_report"): - debug("Reporting disabled") + LOG.debug("Reporting disabled") return False

return True @@ -70,7 +68,7 @@ def _report_model_usage(model, direction, success): model = "%s_%s" % (model.VENDOR, model.MODEL) data = "%s,%s,%s" % (model, direction, success)

- debug("Reporting model usage: %s" % data) + LOG.debug("Reporting model usage: %s" % data)

proxy = xmlrpclib.ServerProxy(REPORT_URL) id = proxy.report_stats(CHIRP_VERSION, @@ -84,7 +82,7 @@ def _report_model_usage(model, direction, success): def _report_exception(stack): global ENABLED

- debug("Reporting exception") + LOG.debug("Reporting exception")

proxy = xmlrpclib.ServerProxy(REPORT_URL) id = proxy.report_exception(CHIRP_VERSION, @@ -98,7 +96,7 @@ def _report_exception(stack): def _report_misc_error(module, data): global ENABLED

- debug("Reporting misc error with %s" % module) + LOG.debug("Reporting misc error with %s" % module)

proxy = xmlrpclib.ServerProxy(REPORT_URL) id = proxy.report_misc_error(CHIRP_VERSION, @@ -109,12 +107,12 @@ def _report_misc_error(module, data): return id != 0

def _check_for_updates(callback): - debug("Checking for updates") + LOG.debug("Checking for updates") proxy = xmlrpclib.ServerProxy(REPORT_URL) ver = proxy.check_for_updates(CHIRP_VERSION, platform.get_platform().os_version_string())

- debug("Server reports version %s is latest" % ver) + LOG.debug("Server reports version %s is latest" % ver) callback(ver) return True

@@ -128,7 +126,7 @@ class ReportThread(threading.Thread): try: return self.__func(*self.__args) except Exception, e: - debug("Failed to report: %s" % e) + LOG.debug("Failed to report: %s" % e) return False

def run(self): @@ -139,7 +137,7 @@ class ReportThread(threading.Thread): ENABLED = False elif (time.time() - start) > 15: # Reporting took too long - debug("Time to report was %.2f sec -- Disabling" % \ + LOG.debug("Time to report was %.2f sec -- Disabling" % \ (time.time()-start)) ENABLED = False

@@ -151,13 +149,13 @@ def dispatch_thread(func, *args):

# If reporting is disabled or failing, bail if not should_report(): - debug("Reporting is disabled") + LOG.debug("Reporting is disabled") return

# If the time between now and the last report is less than 5 seconds, bail delta = time.time() - LAST if delta < 5 and func == LAST_TYPE: - debug("Throttling...") + LOG.debug("Throttling...") return

LAST = time.time() @@ -165,7 +163,7 @@ def dispatch_thread(func, *args):

# If there are already too many threads running, bail if not THREAD_SEM.acquire(False): - debug("Too many threads already running") + LOG.debug("Too many threads already running") return

t = ReportThread(func, *args)

# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID 3db4f1501a5afde03ce0fbfd6d3b45d54bee5818

Add pep8 checker script (#2355)

This patch adds a new script that runs the pep8 tool on the CHIRP source code files. This script is intended to be included in the repository pre-commit hook, preventing patches from causing style regressions.

The script checks a blacklist of files that are not yet compliant with the style standards, and those files will not be scanned (unless -a is given). Since no new files should ever be added to the blacklist, it should eventually shrink to empty, and the script will check the entire codebase.

The blacklist makes it safe to begin using this tool immediately, so this patch also adds a call to it from run_all_tests.sh.

diff --git a/run_all_tests.sh b/run_all_tests.sh index 48e20a4..2437d19 100755 --- a/run_all_tests.sh +++ b/run_all_tests.sh @@ -26,8 +26,15 @@ function style_tests() { ./tools/checkpatch.sh }

-TESTS="unit_tests driver_tests make_supported style_tests" -for testname in $TESTS; do +function pep8() { + echo "Checking for PEP8 regressions..." + time ./tools/cpep8.py --stats +} + +if test -z "${TESTS[*]}"; then + TESTS=( unit_tests driver_tests make_supported style_tests pep8 ) +fi +for testname in "${TESTS[@]}"; do eval "$testname" || record_failure "$testname" done

diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist new file mode 100644 index 0000000..e74c723 --- /dev/null +++ b/tools/cpep8.blacklist @@ -0,0 +1,137 @@ +# cpep8.blacklist: The list of files that do not meet PEP8 standards. +# DO NOT ADD NEW FILES!! Instead, fix the code to be compliant. +# Over time, this list should shrink and (eventually) be eliminated. +./chirp/__init__.py +./chirp/alinco.py +./chirp/anytone.py +./chirp/ap510.py +./chirp/bandplan.py +./chirp/bandplan_au.py +./chirp/bandplan_iaru_r1.py +./chirp/bandplan_iaru_r2.py +./chirp/bandplan_iaru_r3.py +./chirp/bandplan_na.py +./chirp/baofeng_uv3r.py +./chirp/bitwise.py +./chirp/bitwise_grammar.py +./chirp/bjuv55.py +./chirp/chirp_common.py +./chirp/detect.py +./chirp/directory.py +./chirp/elib_intl.py +./chirp/errors.py +./chirp/ft1802.py +./chirp/ft1d.py +./chirp/ft2800.py +./chirp/ft50.py +./chirp/ft50_ll.py +./chirp/ft60.py +./chirp/ft7800.py +./chirp/ft817.py +./chirp/ft857.py +./chirp/ft90.py +./chirp/ftm350.py +./chirp/generic_csv.py +./chirp/generic_tpe.py +./chirp/generic_xml.py +./chirp/h777.py +./chirp/ic208.py +./chirp/ic2100.py +./chirp/ic2200.py +./chirp/ic2720.py +./chirp/ic2820.py +./chirp/ic9x.py +./chirp/ic9x_icf.py +./chirp/ic9x_icf_ll.py +./chirp/ic9x_ll.py +./chirp/icf.py +./chirp/icomciv.py +./chirp/icq7.py +./chirp/ict70.py +./chirp/ict8.py +./chirp/icw32.py +./chirp/icx8x.py +./chirp/icx8x_ll.py +./chirp/id31.py +./chirp/id800.py +./chirp/id880.py +./chirp/idrp.py +./chirp/import_logic.py +./chirp/kenwood_hmk.py +./chirp/kenwood_itm.py +./chirp/kenwood_live.py +./chirp/kguv8d.py +./chirp/kyd.py +./chirp/leixen.py +./chirp/memmap.py +./chirp/platform.py +./chirp/puxing.py +./chirp/pyPEG.py +./chirp/radioreference.py +./chirp/rfinder.py +./chirp/settings.py +./chirp/template.py +./chirp/th9800.py +./chirp/th_uv3r.py +./chirp/th_uv3r25.py +./chirp/th_uvf8d.py +./chirp/thd72.py +./chirp/thuv1f.py +./chirp/tk8102.py +./chirp/tmv71.py +./chirp/tmv71_ll.py +./chirp/util.py +./chirp/uv5r.py +./chirp/uvb5.py +./chirp/vx170.py +./chirp/vx2.py +./chirp/vx3.py +./chirp/vx5.py +./chirp/vx510.py +./chirp/vx6.py +./chirp/vx7.py +./chirp/vx8.py +./chirp/vxa700.py +./chirp/wouxun.py +./chirp/wouxun_common.py +./chirp/xml_ll.py +./chirp/yaesu_clone.py +./chirpc +./chirpui/bankedit.py +./chirpui/clone.py +./chirpui/cloneprog.py +./chirpui/common.py +./chirpui/config.py +./chirpui/dstaredit.py +./chirpui/editorset.py +./chirpui/fips.py +./chirpui/importdialog.py +./chirpui/inputdialog.py +./chirpui/mainapp.py +./chirpui/memdetail.py +./chirpui/memedit.py +./chirpui/miscwidgets.py +./chirpui/radiobrowser.py +./chirpui/reporting.py +./chirpui/settingsedit.py +./chirpui/shiftdialog.py +./chirpw +./csvdump/__init__.py +./csvdump/csvapp.py +./csvdump/csvdump.py +./locale/check_parameters.py +./rpttool +./setup.py +./share/make_supported.py +./tests/run_tests +./tests/unit/base.py +./tests/unit/test_bitwise.py +./tests/unit/test_chirp_common.py +./tests/unit/test_import_logic.py +./tests/unit/test_mappingmodel.py +./tests/unit/test_memedit_edits.py +./tests/unit/test_platform.py +./tests/unit/test_settings.py +./tests/unit/test_shiftdialog.py +./tools/bitdiff.py +./tools/img2thd72.py diff --git a/tools/cpep8.manifest b/tools/cpep8.manifest new file mode 100644 index 0000000..2fe9d77 --- /dev/null +++ b/tools/cpep8.manifest @@ -0,0 +1,4 @@ +./chirpc +./chirpw +./rpttool +./tests/run_tests diff --git a/tools/cpep8.py b/tools/cpep8.py new file mode 100755 index 0000000..efaca7a --- /dev/null +++ b/tools/cpep8.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python +# +# cpep8.py - Check Python source files for PEP8 compliance. +# +# Copyright 2015 Zachary T Welch zach@mandolincreekfarm.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. + +import os +import sys +import logging +import argparse +import pep8 + +scriptdir = os.path.dirname(sys.argv[0]) + +parser = argparse.ArgumentParser() +parser.add_argument("-a", "--all", action="store_true", + help="Check all files, ignoring blacklist") +parser.add_argument("-d", "--dir", action="store", default=".", + help="Root directory of source tree") +parser.add_argument("-s", "--stats", action="store_true", + help="Only show statistics") +parser.add_argument("-u", "--update", action="store_true", + help="Update the blacklist file") +parser.add_argument("-v", "--verbose", action="store_true", + help="Display list of checked files") +parser.add_argument("files", metavar="file", nargs='*', + help="List of files to check (if none, check all)") +args = parser.parse_args() + + +def file_to_lines(name): + fh = file(name, "r") + lines = fh.read().split("\n") + lines.pop() + fh.close() + return lines + +# read manifest and search for python files +manifest = file_to_lines(os.path.join(scriptdir, "cpep8.manifest")) +for root, dirs, files in os.walk(args.dir): + for f in files: + if f.endswith('.py'): + manifest.append(os.path.join(root, f)) + +# read the blacklisted source files +blacklist_filename = os.path.join(scriptdir, "cpep8.blacklist") +blacklist = file_to_lines(blacklist_filename) + +if args.update: + bad = [] + for f in manifest: + checker = pep8.StyleGuide(quiet=True) + results = checker.check_files([f]) + if results.total_errors: + bad.append(f) + with file(blacklist_filename, "w") as fh: + print >>fh, """\ +# cpep8.blacklist: The list of files that do not meet PEP8 standards. +# DO NOT ADD NEW FILES!! Instead, fix the code to be compliant. +# Over time, this list should shrink and (eventually) be eliminated.""" + print >>fh, "\n".join(sorted(bad)) + sys.exit(0) + +if args.files: + manifest = args.files + +check_list = [] +for f in manifest: + if args.all or f not in blacklist: + check_list.append(f) +check_list = sorted(check_list) + +if args.verbose: + print "Checking the following files:\n", "\n".join(check_list) + +checker = pep8.StyleGuide(quiet=args.stats) +results = checker.check_files(check_list) +if args.stats: + results.print_statistics() + +sys.exit(results.total_errors and 1 or 0)

# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID 07893d7a7e5dd2475726926610819ae29f44c8e3

Fix style issues (1/4) (#2355)

This patch contains whitespace-only changes that eliminate all of the PEP8 style warnings in the CLI and GUI scripts.

diff --git a/chirpc b/chirpc index 16c7006..4981374 100755 --- a/chirpc +++ b/chirpc @@ -26,16 +26,18 @@ from chirp import * from chirp import chirp_common, errors, idrp, directory, util

LOG = logging.getLogger("chirpc") +RADIOS = directory.DRV_TO_RADIO +

def fail_unsupported(): print "Operation not supported by selected radio" sys.exit(1)

+ def fail_missing_mmap(): print "mmap-only operation requires specification of an mmap file" sys.exit(1)

-RADIOS = directory.DRV_TO_RADIO

class ToneAction(argparse.Action): # def __init__(self, **kwargs): @@ -46,6 +48,7 @@ class ToneAction(argparse.Action): raise argparse.ArgumentError("Invalid tone valeu: %.1f" % value) setattr(namespace, self.dest, value)

+ class DTCSAction(argparse.Action): def __call__(self, parser, namespace, value, option_string=None): try: @@ -57,6 +60,7 @@ class DTCSAction(argparse.Action): raise argparse.ArgumentError("Invalid DTCS value: %03i" % value) setattr(namespace, self.dest, value)

+ class DTCSPolarityAction(argparse.Action): def __call__(self, parser, namespace, value, option_string=None): if value not in ["NN", "RN", "NR", "RR"]: @@ -65,251 +69,244 @@ class DTCSPolarityAction(argparse.Action):

if __name__ == "__main__": - parser = argparse.ArgumentParser() - logger.add_version_argument(parser) - parser.add_argument("-s", "--serial", dest="serial", - default="mmap", - help="Serial port (default: mmap)") - - parser.add_argument("-i", "--id", dest="id", - default=False, - action="store_true", - help="Request radio ID string") - parser.add_argument("--raw", dest="raw", - default=False, - action="store_true", - help="Dump raw memory location") - - parser.add_argument("--get-mem", dest="get_mem", - default=False, - action="store_true", - help="Get and print memory location") - parser.add_argument("--set-mem-name", dest="set_mem_name", - default=None, - help="Set memory name") - parser.add_argument("--set-mem-freq", dest="set_mem_freq", - type=float, - default=None, - help="Set memory frequency") - - parser.add_argument("--set-mem-tencon", dest="set_mem_tencon", - default=False, - action="store_true", - help="Set tone encode enabled flag") - parser.add_argument("--set-mem-tencoff", dest="set_mem_tencoff", - default=False, - action="store_true", - help="Set tone decode disabled flag") - parser.add_argument("--set-mem-tsqlon", dest="set_mem_tsqlon", - default=False, - action="store_true", - help="Set tone squelch enabled flag") - parser.add_argument("--set-mem-tsqloff", dest="set_mem_tsqloff", - default=False, - action="store_true", - help="Set tone squelch disabled flag") - parser.add_argument("--set-mem-dtcson", dest="set_mem_dtcson", - default=False, - action="store_true", - help="Set DTCS enabled flag") - parser.add_argument("--set-mem-dtcsoff", dest="set_mem_dtcsoff", - default=False, - action="store_true", - help="Set DTCS disabled flag") - - parser.add_argument("--set-mem-tenc", dest="set_mem_tenc", - type=float, action=ToneAction, nargs=1, - help="Set memory encode tone") - parser.add_argument("--set-mem-tsql", dest="set_mem_tsql", - type=float, action=ToneAction, nargs=1, - help="Set memory squelch tone") - - parser.add_argument("--set-mem-dtcs", dest="set_mem_dtcs", - type=int, action=DTCSAction, nargs=1, - help="Set memory DTCS code") - parser.add_argument("--set-mem-dtcspol", dest="set_mem_dtcspol", - action=DTCSPolarityAction, nargs=1, - help="Set memory DTCS polarity (NN, NR, RN, RR)") - - parser.add_argument("--set-mem-dup", dest="set_mem_dup", - help="Set memory duplex (+,-, or blank)") - parser.add_argument("--set-mem-offset", dest="set_mem_offset", - type=float, - help="Set memory duplex offset (in MHz)") - - parser.add_argument("--set-mem-mode", dest="set_mem_mode", - default=None, - help="Set mode (%s)" % ",".join(chirp_common.MODES)) - parser.add_argument("-r", "--radio", dest="radio", - default=None, - help="Radio model (see --list-radios)") - parser.add_argument("--list-radios", action="store_true", - help="List radio models") - parser.add_argument("--mmap", dest="mmap", - default=None, - help="Radio memory map file location") - parser.add_argument("--download-mmap", dest="download_mmap", - action="store_true", - default=False, - help="Download memory map from radio") - parser.add_argument("--upload-mmap", dest="upload_mmap", - action="store_true", - default=False, - help="Upload memory map to radio") - logger.add_arguments(parser) - parser.add_argument("args", metavar="arg", nargs='*', - help="Some commands require additional arguments") - - if len(sys.argv) <= 1: - parser.print_help() - sys.exit(0) - - options = parser.parse_args() - args = options.args - - logger.handle_options(options) - - if options.list_radios: - print "Supported Radios:\n\t", "\n\t".join(sorted(RADIOS.keys())) - sys.exit(0) - - if options.id: - from chirp import icf - - s = serial.Serial(port=options.serial, - baudrate=9600, - timeout=0.5) - - md = icf.get_model_data(s) - - print "Model:\n%s" % util.hexprint(md) - - sys.exit(0) - - if not options.radio: - if options.mmap: - rclass = directory.get_radio_by_image(options.mmap).__class__ - else: - print "Must specify a radio model" - sys.exit(1) - else: - rclass = directory.get_radio(options.radio) - - if options.serial == "mmap": - if options.mmap: - s = options.mmap - else: - s = options.radio + ".img" - else: - print "opening %s at %i" % (options.serial, rclass.BAUD_RATE) - s = serial.Serial(port=options.serial, - baudrate=rclass.BAUD_RATE, - timeout=0.5) - - radio = rclass(s) - - if options.raw: - data = radio.get_raw_memory(int(args[0])) - for i in data: - if ord(i) > 0x7F: - print "Memory location %i (%i):\n%s" % (int(args[0]), - len(data), - util.hexprint(data)) - sys.exit(0) - print data - sys.exit(0) - - if options.set_mem_dup is not None: - if options.set_mem_dup != "+" and \ - options.set_mem_dup != "-" and \ - options.set_mem_dup != "": - print "Invalid duplex value `%s'" % options.set_mem_dup - print "Valid values are: '+', '-', ''" - sys.exit(1) - else: - _dup = options.set_mem_dup - else: - _dup = None - - if options.set_mem_mode: - print "Set mode: %s" % options.set_mem_mode - if options.set_mem_mode not in chirp_common.MODES: - print "Invalid mode `%s'" - sys.exit(1) - else: - _mode = options.set_mem_mode - else: - _mode = None - - if options.set_mem_name or options.set_mem_freq or \ - options.set_mem_tencon or options.set_mem_tencoff or \ - options.set_mem_tsqlon or options.set_mem_tsqloff or \ - options.set_mem_dtcson or options.set_mem_dtcsoff or \ - options.set_mem_tenc or options.set_mem_tsql or options.set_mem_dtcs or\ - options.set_mem_dup is not None or \ - options.set_mem_mode or options.set_mem_dtcspol or\ - options.set_mem_offset: - try: - mem = radio.get_memory(int(args[0])) - except errors.InvalidMemoryLocation: - mem = chirp_common.Memory() - mem.number = int(args[0]) - - mem.name = options.set_mem_name or mem.name - mem.freq = options.set_mem_freq or mem.freq - mem.rtone = options.set_mem_tenc or mem.rtone - mem.ctone = options.set_mem_tsql or mem.ctone - mem.dtcs = options.set_mem_dtcs or mem.dtcs - mem.dtcs_polarity = options.set_mem_dtcspol or mem.dtcs_polarity - if _dup is not None: - mem.duplex = _dup - mem.offset = options.set_mem_offset or mem.offset - mem.mode = _mode or mem.mode - - if options.set_mem_tencon: - mem.tencEnabled = True - elif options.set_mem_tencoff: - mem.tencEnabled = False - - if options.set_mem_tsqlon: - mem.tsqlEnabled = True - elif options.set_mem_tsqloff: - mem.tsqlEnabled = False - - if options.set_mem_dtcson: - mem.dtcsEnabled = True - elif options.set_mem_dtcsoff: - mem.dtcsEnabled = False - - radio.set_memory(mem) - - if options.get_mem: - try: - pos = int(args[0]) - except ValueError: - pos = args[0] - - try: - mem = radio.get_memory(pos) - except errors.InvalidMemoryLocation, e: - mem = chirp_common.Memory() - mem.number = pos - - print mem - - if options.download_mmap: - #isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported() - radio.sync_in() - radio.save_mmap(options.mmap) - - if options.upload_mmap: - #isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported() - radio.load_mmap(options.mmap) - if radio.sync_out(): - print "Clone successful" - else: - print "Clone failed" - - if options.mmap and isinstance(radio, chirp_common.CloneModeRadio): - radio.save_mmap(options.mmap) - + parser = argparse.ArgumentParser() + logger.add_version_argument(parser) + parser.add_argument("-s", "--serial", dest="serial", + default="mmap", + help="Serial port (default: mmap)") + + parser.add_argument("-i", "--id", dest="id", + default=False, + action="store_true", + help="Request radio ID string") + parser.add_argument("--raw", dest="raw", + default=False, + action="store_true", + help="Dump raw memory location") + + parser.add_argument("--get-mem", dest="get_mem", + default=False, + action="store_true", + help="Get and print memory location") + parser.add_argument("--set-mem-name", dest="set_mem_name", + default=None, + help="Set memory name") + parser.add_argument("--set-mem-freq", dest="set_mem_freq", + type=float, + default=None, + help="Set memory frequency") + + parser.add_argument("--set-mem-tencon", dest="set_mem_tencon", + default=False, + action="store_true", + help="Set tone encode enabled flag") + parser.add_argument("--set-mem-tencoff", dest="set_mem_tencoff", + default=False, + action="store_true", + help="Set tone decode disabled flag") + parser.add_argument("--set-mem-tsqlon", dest="set_mem_tsqlon", + default=False, + action="store_true", + help="Set tone squelch enabled flag") + parser.add_argument("--set-mem-tsqloff", dest="set_mem_tsqloff", + default=False, + action="store_true", + help="Set tone squelch disabled flag") + parser.add_argument("--set-mem-dtcson", dest="set_mem_dtcson", + default=False, + action="store_true", + help="Set DTCS enabled flag") + parser.add_argument("--set-mem-dtcsoff", dest="set_mem_dtcsoff", + default=False, + action="store_true", + help="Set DTCS disabled flag") + + parser.add_argument("--set-mem-tenc", dest="set_mem_tenc", + type=float, action=ToneAction, nargs=1, + help="Set memory encode tone") + parser.add_argument("--set-mem-tsql", dest="set_mem_tsql", + type=float, action=ToneAction, nargs=1, + help="Set memory squelch tone") + + parser.add_argument("--set-mem-dtcs", dest="set_mem_dtcs", + type=int, action=DTCSAction, nargs=1, + help="Set memory DTCS code") + parser.add_argument("--set-mem-dtcspol", dest="set_mem_dtcspol", + action=DTCSPolarityAction, nargs=1, + help="Set memory DTCS polarity (NN, NR, RN, RR)") + + parser.add_argument("--set-mem-dup", dest="set_mem_dup", + help="Set memory duplex (+,-, or blank)") + parser.add_argument("--set-mem-offset", dest="set_mem_offset", + type=float, + help="Set memory duplex offset (in MHz)") + + parser.add_argument("--set-mem-mode", dest="set_mem_mode", + default=None, + help="Set mode (%s)" % ",".join(chirp_common.MODES)) + parser.add_argument("-r", "--radio", dest="radio", + default=None, + help="Radio model (see --list-radios)") + parser.add_argument("--list-radios", action="store_true", + help="List radio models") + parser.add_argument("--mmap", dest="mmap", + default=None, + help="Radio memory map file location") + parser.add_argument("--download-mmap", dest="download_mmap", + action="store_true", + default=False, + help="Download memory map from radio") + parser.add_argument("--upload-mmap", dest="upload_mmap", + action="store_true", + default=False, + help="Upload memory map to radio") + logger.add_arguments(parser) + parser.add_argument("args", metavar="arg", nargs='*', + help="Some commands require additional arguments") + + if len(sys.argv) <= 1: + parser.print_help() + sys.exit(0) + + options = parser.parse_args() + args = options.args + + logger.handle_options(options) + + if options.list_radios: + print "Supported Radios:\n\t", "\n\t".join(sorted(RADIOS.keys())) + sys.exit(0) + + if options.id: + from chirp import icf + s = serial.Serial(port=options.serial, baudrate=9600, timeout=0.5) + md = icf.get_model_data(s) + print "Model:\n%s" % util.hexprint(md) + sys.exit(0) + + if not options.radio: + if options.mmap: + rclass = directory.get_radio_by_image(options.mmap).__class__ + else: + print "Must specify a radio model" + sys.exit(1) + else: + rclass = directory.get_radio(options.radio) + + if options.serial == "mmap": + if options.mmap: + s = options.mmap + else: + s = options.radio + ".img" + else: + print "opening %s at %i" % (options.serial, rclass.BAUD_RATE) + s = serial.Serial(port=options.serial, + baudrate=rclass.BAUD_RATE, + timeout=0.5) + + radio = rclass(s) + + if options.raw: + data = radio.get_raw_memory(int(args[0])) + for i in data: + if ord(i) > 0x7F: + print "Memory location %i (%i):\n%s" % (int(args[0]), + len(data), + util.hexprint(data)) + sys.exit(0) + print data + sys.exit(0) + + if options.set_mem_dup is not None: + if options.set_mem_dup != "+" and \ + options.set_mem_dup != "-" and \ + options.set_mem_dup != "": + print "Invalid duplex value `%s'" % options.set_mem_dup + print "Valid values are: '+', '-', ''" + sys.exit(1) + else: + _dup = options.set_mem_dup + else: + _dup = None + + if options.set_mem_mode: + print "Set mode: %s" % options.set_mem_mode + if options.set_mem_mode not in chirp_common.MODES: + print "Invalid mode `%s'" + sys.exit(1) + else: + _mode = options.set_mem_mode + else: + _mode = None + + if options.set_mem_name or options.set_mem_freq or \ + options.set_mem_tencon or options.set_mem_tencoff or \ + options.set_mem_tsqlon or options.set_mem_tsqloff or \ + options.set_mem_dtcson or options.set_mem_dtcsoff or \ + options.set_mem_tenc or options.set_mem_tsql or \ + options.set_mem_dtcs or options.set_mem_dup is not None or \ + options.set_mem_mode or options.set_mem_dtcspol or\ + options.set_mem_offset: + try: + mem = radio.get_memory(int(args[0])) + except errors.InvalidMemoryLocation: + mem = chirp_common.Memory() + mem.number = int(args[0]) + + mem.name = options.set_mem_name or mem.name + mem.freq = options.set_mem_freq or mem.freq + mem.rtone = options.set_mem_tenc or mem.rtone + mem.ctone = options.set_mem_tsql or mem.ctone + mem.dtcs = options.set_mem_dtcs or mem.dtcs + mem.dtcs_polarity = options.set_mem_dtcspol or mem.dtcs_polarity + if _dup is not None: + mem.duplex = _dup + mem.offset = options.set_mem_offset or mem.offset + mem.mode = _mode or mem.mode + + if options.set_mem_tencon: + mem.tencEnabled = True + elif options.set_mem_tencoff: + mem.tencEnabled = False + + if options.set_mem_tsqlon: + mem.tsqlEnabled = True + elif options.set_mem_tsqloff: + mem.tsqlEnabled = False + + if options.set_mem_dtcson: + mem.dtcsEnabled = True + elif options.set_mem_dtcsoff: + mem.dtcsEnabled = False + + radio.set_memory(mem) + + if options.get_mem: + try: + pos = int(args[0]) + except ValueError: + pos = args[0] + + try: + mem = radio.get_memory(pos) + except errors.InvalidMemoryLocation, e: + mem = chirp_common.Memory() + mem.number = pos + + print mem + + if options.download_mmap: + #isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported() + radio.sync_in() + radio.save_mmap(options.mmap) + + if options.upload_mmap: + #isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported() + radio.load_mmap(options.mmap) + if radio.sync_out(): + print "Clone successful" + else: + print "Clone failed" + + if options.mmap and isinstance(radio, chirp_common.CloneModeRadio): + radio.save_mmap(options.mmap) diff --git a/chirpw b/chirpw index 67c9ee0..073ef50 100755 --- a/chirpw +++ b/chirpw @@ -40,16 +40,16 @@ conf = config.get() manual_language = conf.get("language", "state") langs = [] if manual_language and manual_language != "Auto": - lang_codes = { "English" : "en_US", - "Polish" : "pl", - "Italian" : "it", - "Dutch" : "nl", - "German" : "de", - "Hungarian" : "hu", - "Russian" : "ru", - "Portuguese (BR)" : "pt_BR", - "French" : "fr", - } + lang_codes = {"English": "en_US", + "Polish": "pl", + "Italian": "it", + "Dutch": "nl", + "German": "de", + "Hungarian": "hu", + "Russian": "ru", + "Portuguese (BR)": "pt_BR", + "French": "fr", + } try: print lang_codes[manual_language] langs = [lang_codes[manual_language]] @@ -58,7 +58,7 @@ if manual_language and manual_language != "Auto": else: lc, encoding = locale.getdefaultlocale() if (lc): - langs = [lc] + langs = [lc] try: langs += os.getenv("LANG").split(":") except: @@ -79,6 +79,7 @@ lang = gettext.translation("CHIRP", localepath, languages=langs,

import gtk

+ # Python <2.6 does not have str.format(), which chirp uses to make translation # strings nicer. So, instead of installing the gettext standard "_()" function, # we can install our own, which returns a string of the following class, @@ -87,21 +88,22 @@ import gtk class CompatStr(str): def format(self, **kwargs): base = lang.gettext(self) - for k,v in kwargs.items(): + for k, v in kwargs.items(): base = base.replace("{%s}" % k, str(v)) return base

pyver = sys.version.split()[0]

-try : +try: vmaj, vmin, vrel = pyver.split(".", 3) -except : +except: vmaj, vmin = pyver.split(".", 2) vrel = 0

if int(vmaj) < 2 or int(vmin) < 6: # Python <2.6, emulate str.format() import __builtin__ + def lang_with_format(string): return CompatStr(string) __builtin__._ = lang_with_format @@ -131,7 +133,8 @@ for i in args.files: a.show()

if args.profile: - import cProfile, pstats + import cProfile + import pstats cProfile.run("gtk.main()", "chirpw.stats") p = pstats.Stats("chirpw.stats") p.sort_stats("cumulative").print_stats(10) diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index e74c723..1aad90b 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -96,7 +96,6 @@ ./chirp/wouxun_common.py ./chirp/xml_ll.py ./chirp/yaesu_clone.py -./chirpc ./chirpui/bankedit.py ./chirpui/clone.py ./chirpui/cloneprog.py @@ -115,7 +114,6 @@ ./chirpui/reporting.py ./chirpui/settingsedit.py ./chirpui/shiftdialog.py -./chirpw ./csvdump/__init__.py ./csvdump/csvapp.py ./csvdump/csvdump.py

# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID 48fa93c24c4b0bea112d995d8a0a03abc3f1e1e6

Fix style issues (3/4) (#2355)

This patch fixes more low-hanging style issues. For the most part, these are all whitespace changes, but there were a handful of idiomatic changes flagged by the pep8 tool too: "x.has_key(y)" is now "y in x".

diff --git a/chirp/detect.py b/chirp/detect.py index eeefb32..580670f 100644 --- a/chirp/detect.py +++ b/chirp/detect.py @@ -18,6 +18,7 @@ import serial from chirp import errors, icf, directory, ic9x_ll from chirp import kenwood_live, icomciv

+ def _icom_model_data_to_rclass(md): for _rtype, rclass in directory.DRV_TO_RADIO.items(): if rclass.VENDOR != "Icom": @@ -27,11 +28,9 @@ def _icom_model_data_to_rclass(md): if rclass.get_model()[:4] == md[:4]: return rclass

- raise errors.RadioError("Unknown radio type %02x%02x%02x%02x" %\ - (ord(md[0]), - ord(md[1]), - ord(md[2]), - ord(md[3]))) + raise errors.RadioError("Unknown radio type %02x%02x%02x%02x" % + (ord(md[0]), ord(md[1]), ord(md[2]), ord(md[3]))) +

def _detect_icom_radio(ser): # ICOM VHF/UHF Clone-type radios @ 9600 baud @@ -65,6 +64,7 @@ def _detect_icom_radio(ser):

raise errors.RadioError("Unable to get radio model")

+ def detect_icom_radio(port): """Detect which Icom model is connected to @port""" ser = serial.Serial(port=port, timeout=0.5) @@ -83,6 +83,7 @@ def detect_icom_radio(port):

return result

+ def detect_kenwoodlive_radio(port): """Detect which Kenwood model is connected to @port""" ser = serial.Serial(port=port, baudrate=9600, timeout=0.5) @@ -100,6 +101,6 @@ def detect_kenwoodlive_radio(port): raise errors.RadioError("Unsupported model `%s'" % r_id)

DETECT_FUNCTIONS = { - "Icom" : detect_icom_radio, - "Kenwood" : detect_kenwoodlive_radio, + "Icom": detect_icom_radio, + "Kenwood": detect_kenwoodlive_radio, } diff --git a/chirp/directory.py b/chirp/directory.py index 07308ee..7b529e6 100644 --- a/chirp/directory.py +++ b/chirp/directory.py @@ -23,6 +23,7 @@ from chirp import chirp_common, util, rfinder, radioreference, errors

LOG = logging.getLogger(__name__)

+ def radio_class_id(cls): """Return a unique identification string for @cls""" ident = "%s_%s" % (cls.VENDOR, cls.MODEL) @@ -34,7 +35,10 @@ def radio_class_id(cls): ident = ident.replace(")", "") return ident

+ ALLOW_DUPS = False + + def enable_reregistrations(): """Set the global flag ALLOW_DUPS=True, which will enable a driver to re-register for a slot in the directory without triggering an @@ -44,6 +48,7 @@ def enable_reregistrations(): print "NOTE: driver re-registration enabled" ALLOW_DUPS = True

+ def register(cls): """Register radio @cls with the directory""" global DRV_TO_RADIO @@ -59,25 +64,29 @@ def register(cls):

return cls

+ DRV_TO_RADIO = {} RADIO_TO_DRV = {}

+ def get_radio(driver): """Get radio driver class by identification string""" - if DRV_TO_RADIO.has_key(driver): + if driver in DRV_TO_RADIO: return DRV_TO_RADIO[driver] else: raise Exception("Unknown radio type `%s'" % driver)

+ def get_driver(rclass): """Get the identification string for a given class""" - if RADIO_TO_DRV.has_key(rclass): + if rclass in RADIO_TO_DRV: return RADIO_TO_DRV[rclass] - elif RADIO_TO_DRV.has_key(rclass.__bases__[0]): + elif rclass.__bases__[0] in RADIO_TO_DRV: return RADIO_TO_DRV[rclass.__bases__[0]] else: raise Exception("Unknown radio type `%s'" % rclass)

+ def icf_to_image(icf_file, img_file): # FIXME: Why is this here? """Convert an ICF file to a .img file""" @@ -90,7 +99,7 @@ def icf_to_image(icf_file, img_file): img_data = mmap.get_packed()[:model._memsize] break except Exception: - pass # Skip non-Icoms + pass # Skip non-Icoms

if img_data: f = file(img_file, "wb") @@ -101,6 +110,7 @@ def icf_to_image(icf_file, img_file): print util.hexprint(mdata) raise Exception("Unsupported model")

+ def get_radio_by_image(image_file): """Attempt to get the radio class that owns @image_file""" if image_file.startswith("radioreference://"): @@ -108,13 +118,13 @@ def get_radio_by_image(image_file): rr = radioreference.RadioReferenceRadio(None) rr.set_params(zipcode, username, password) return rr - + if image_file.startswith("rfinder://"): _, _, email, passwd, lat, lon, miles = image_file.split("/") rf = rfinder.RFinderRadio(None) rf.set_params((float(lat), float(lon)), int(miles), email, passwd) return rf - + if os.path.exists(image_file) and icf.is_icf_file(image_file): tempf = tempfile.mktemp() icf_to_image(image_file, tempf) diff --git a/chirp/generic_tpe.py b/chirp/generic_tpe.py index f720c0f..a1f0bf6 100644 --- a/chirp/generic_tpe.py +++ b/chirp/generic_tpe.py @@ -25,14 +25,14 @@ class TpeRadio(generic_csv.CSVRadio): FILE_EXTENSION = "tpe"

ATTR_MAP = { - "Sequence Number" : (int, "number"), - "Location" : (str, "comment"), - "Call Sign" : (str, "name"), + "Sequence Number": (int, "number"), + "Location": (str, "comment"), + "Call Sign": (str, "name"), "Output Frequency": (chirp_common.parse_freq, "freq"), - "Input Frequency" : (str, "duplex"), - "CTCSS Tones" : (lambda v: float(v) - if v and float(v) in chirp_common.TONES - else 88.5, "rtone"), + "Input Frequency": (str, "duplex"), + "CTCSS Tones": (lambda v: float(v) + if v and float(v) in chirp_common.TONES + else 88.5, "rtone"), "Repeater Notes": (str, "comment"), }

diff --git a/chirp/generic_xml.py b/chirp/generic_xml.py index 1153c63..b8aec0a 100644 --- a/chirp/generic_xml.py +++ b/chirp/generic_xml.py @@ -18,12 +18,13 @@ import libxml2

from chirp import chirp_common, errors, xml_ll, platform, directory

+ def validate_doc(doc): """Validate the document""" basepath = platform.get_platform().executable_path() path = os.path.abspath(os.path.join(basepath, "chirp.xsd")) if not os.path.exists(path): - path = "/usr/share/chirp/chirp.xsd" + path = "/usr/share/chirp/chirp.xsd"

try: ctx = libxml2.schemaNewParserCtxt(path) @@ -54,6 +55,7 @@ def validate_doc(doc): print os.linesep.join(errs) raise errors.RadioError("Schema error")

+ def default_banks(): """Return an empty set of banks""" banks = [] @@ -63,6 +65,7 @@ def default_banks():

return banks

+ @directory.register class XMLRadio(chirp_common.FileBackedRadio, chirp_common.IcomDstarSupport): """Generic XML driver""" @@ -94,7 +97,7 @@ class XMLRadio(chirp_common.FileBackedRadio, chirp_common.IcomDstarSupport): rf.valid_name_length = 999 rf.valid_tmodes = ["", "Tone", "TSQL", "DTCS"] return rf - + def load(self, filename=None): if not self._filename and not filename: raise errors.RadioError("Need a location to load from") @@ -125,7 +128,7 @@ class XMLRadio(chirp_common.FileBackedRadio, chirp_common.IcomDstarSupport): pass

return mems - + def get_memory(self, number): mem = xml_ll.get_memory(self.doc, number)

diff --git a/chirp/memmap.py b/chirp/memmap.py index 2230265..73285bf 100644 --- a/chirp/memmap.py +++ b/chirp/memmap.py @@ -15,6 +15,7 @@

from chirp import util

+ class MemoryMap: """ A pythonic memory map interface @@ -54,8 +55,8 @@ class MemoryMap: self._data[pos] = byte pos += 1 else: - raise ValueError("Unsupported type %s for value" % \ - type(value).__name__) + raise ValueError("Unsupported type %s for value" % + type(value).__name__)

def get_packed(self): """Return the entire memory map as raw data""" diff --git a/chirp/radioreference.py b/chirp/radioreference.py index 9ca54aa..e7bae27 100644 --- a/chirp/radioreference.py +++ b/chirp/radioreference.py @@ -22,15 +22,16 @@ except ImportError: HAVE_SUDS = False

MODES = { - "FM" : "FM", - "AM" : "AM", - "FMN" : "NFM", + "FM": "FM", + "AM": "AM", + "FMN": "NFM", "D-STAR": "DV", - "USB" : "USB", - "LSB" : "LSB", - "P25" : "P25", + "USB": "USB", + "LSB": "LSB", + "P25": "P25", }

+ class RadioReferenceRadio(chirp_common.NetworkSourceRadio): """RadioReference.com data source""" VENDOR = "Radio Reference LLC" @@ -44,7 +45,7 @@ class RadioReferenceRadio(chirp_common.NetworkSourceRadio):

if not HAVE_SUDS: raise errors.RadioError( - "Suds library required for RadioReference.com import.\n" + \ + "Suds library required for RadioReference.com import.\n" + "Try installing your distribution's python-suds package.")

self._auth = {"appKey": self.APPKEY, "username": "", "password": ""} @@ -64,8 +65,9 @@ class RadioReferenceRadio(chirp_common.NetworkSourceRadio): self._freqs = []

try: - zipcode = self._client.service.getZipcodeInfo(self._zip, self._auth) - county = self._client.service.getCountyInfo(zipcode.ctid, self._auth) + service = self._client.service + zipcode = service.getZipcodeInfo(self._zip, self._auth) + county = service.getCountyInfo(zipcode.ctid, self._auth) except WebFault, err: raise errors.RadioError(err)

@@ -130,7 +132,7 @@ class RadioReferenceRadio(chirp_common.NetworkSourceRadio): mem.duplex = "split" mem.offset = chirp_common.parse_freq(str(freq["in"])) if freq.tone is not None: - if str(freq.tone) == "CSQ": # Carrier Squelch + if str(freq.tone) == "CSQ": # Carrier Squelch mem.tmode = "" else: try: diff --git a/chirp/template.py b/chirp/template.py index d01dbea..1477629 100644 --- a/chirp/template.py +++ b/chirp/template.py @@ -32,6 +32,7 @@ struct { } memory[10]; """

+ def do_download(radio): """This is your download function""" # NOTE: Remove this in your real implementation! @@ -49,6 +50,7 @@ def do_download(radio):

return memmap.MemoryMap(data)

+ def do_upload(radio): """This is your upload function""" # NOTE: Remove this in your real implementation! @@ -63,22 +65,23 @@ def do_upload(radio): for i in range(0, 1000): serial.write(radio.get_mmap()[i])

+ # Uncomment this to actually register this radio in CHIRP # @directory.register class TemplateRadio(chirp_common.CloneModeRadio): """Acme Template""" - VENDOR = "Acme" # Replace this with your vendor - MODEL = "Template" # Replace this with your model - BAUD_RATE = 9600 # Replace this with your baud rate + VENDOR = "Acme" # Replace this with your vendor + MODEL = "Template" # Replace this with your model + BAUD_RATE = 9600 # Replace this with your baud rate

# Return information about this radio's features, including # how many memories it has, what bands it supports, etc def get_features(self): rf = chirp_common.RadioFeatures() rf.has_bank = False - rf.memory_bounds = (0, 9) # This radio supports memories 0-9 - rf.valid_bands = [(144000000, 148000000), # Supports 2-meters - (440000000, 450000000), # Supports 70-centimeters + rf.memory_bounds = (0, 9) # This radio supports memories 0-9 + rf.valid_bands = [(144000000, 148000000), # Supports 2-meters + (440000000, 450000000), # Supports 70-centimeters ] return rf

@@ -91,7 +94,7 @@ class TemplateRadio(chirp_common.CloneModeRadio): def sync_out(self): do_upload(self)

- # Return a raw representation of the memory object, which + # Return a raw representation of the memory object, which # is very helpful for development def get_raw_memory(self, number): return repr(self._memobj.memory[number]) @@ -105,10 +108,10 @@ class TemplateRadio(chirp_common.CloneModeRadio): # Create a high-level memory object to return to the UI mem = chirp_common.Memory()

- mem.number = number # Set the memory number - mem.freq = int(_mem.freq) # Convert your low-level frequency - # to Hertz - mem.name = str(_mem.name).rstrip() # Set the alpha tag + mem.number = number # Set the memory number + mem.freq = int(_mem.freq) # Convert your low-level frequency + # to Hertz + mem.name = str(_mem.name).rstrip() # Set the alpha tag

# We'll consider any blank (i.e. 0MHz frequency) to be empty if mem.freq == 0: @@ -125,4 +128,3 @@ class TemplateRadio(chirp_common.CloneModeRadio): _mem.freq = mem.freq # Convert to low-level frequency # representation _mem.name = mem.name.ljust(8)[:8] # Store the alpha tag - diff --git a/chirp/util.py b/chirp/util.py index 8567c45..1fc5529 100644 --- a/chirp/util.py +++ b/chirp/util.py @@ -15,6 +15,7 @@

import struct

+ def hexprint(data, addrfmt=None): """Return a hexdump-like encoding of @data""" if addrfmt is None: @@ -23,13 +24,13 @@ def hexprint(data, addrfmt=None): block_size = 8

lines = len(data) / block_size - + if (len(data) % block_size) != 0: lines += 1 data += "\x00" * ((lines * block_size) - len(data))

out = "" - + for block in range(0, (len(data)/block_size)): addr = block * block_size try: @@ -43,7 +44,7 @@ def hexprint(data, addrfmt=None): limit = left else: limit = block_size - + for j in range(0, limit): out += "%02x " % ord(data[(block * block_size) + j])

@@ -61,6 +62,7 @@ def hexprint(data, addrfmt=None):

return out

+ def bcd_encode(val, bigendian=True, width=None): """This is really old and shouldn't be used anymore""" digits = [] @@ -77,14 +79,15 @@ def bcd_encode(val, bigendian=True, width=None): digits.append(0)

for i in range(0, len(digits), 2): - newval = struct.pack("B", (digits[i+1] << 4) | digits[i]) + newval = struct.pack("B", (digits[i + 1] << 4) | digits[i]) if bigendian: - result = newval + result + result = newval + result else: result = result + newval - + return result

+ def get_dict_rev(thedict, value): """Return the first matching key for a given @value in @dict""" _dict = {} diff --git a/chirpui/clone.py b/chirpui/clone.py index 7210d4a..e9443b0 100644 --- a/chirpui/clone.py +++ b/chirpui/clone.py @@ -24,6 +24,7 @@ from chirpui import miscwidgets, cloneprog, inputdialog, common, config

AUTO_DETECT_STRING = "Auto Detect (Icom Only)"

+ class CloneSettings: def __init__(self): self.port = None @@ -32,11 +33,12 @@ class CloneSettings: def __str__(self): s = "" if self.radio_class: - return _("{vendor} {model} on {port}").format(\ + return _("{vendor} {model} on {port}").format( vendor=self.radio_class.VENDOR, model=self.radio_class.MODEL, port=self.port)

+ class CloneSettingsDialog(gtk.Dialog): def __make_field(self, label, widget): l = gtk.Label(label) @@ -73,7 +75,7 @@ class CloneSettingsDialog(gtk.Dialog): not issubclass(rclass, chirp_common.LiveRadio): continue

- if not vendors.has_key(rclass.VENDOR): + if rclass.VENDOR not in vendors: vendors[rclass.VENDOR] = []

vendors[rclass.VENDOR].append(rclass) @@ -169,7 +171,9 @@ class CloneSettingsDialog(gtk.Dialog): try: cs.radio_class = detect.DETECT_FUNCTIONS[vendor](cs.port) if not cs.radio_class: - raise Exception(_("Unable to detect radio on {port}").format(port=cs.port)) + raise Exception( + _("Unable to detect radio on {port}").format( + port=cs.port)) except Exception, e: d = inputdialog.ExceptionDialog(e) d.run() @@ -181,7 +185,9 @@ class CloneSettingsDialog(gtk.Dialog): cs.radio_class = rclass break if not cs.radio_class: - common.show_error(_("Internal error: Unable to upload to {model}").format(model=model)) + common.show_error( + _("Internal error: Unable to upload to {model}").format( + model=model)) print self.__vendors return None

@@ -192,9 +198,11 @@ class CloneSettingsDialog(gtk.Dialog):

return cs

+ class CloneCancelledException(Exception): pass

+ class CloneThread(threading.Thread): def __status(self, status): gobject.idle_add(self.__progw.status, status) @@ -219,7 +227,7 @@ class CloneThread(threading.Thread): gobject.idle_add(self.__progw.show)

self.__radio.status_fn = self.__status - + try: if self.__out: self.__radio.sync_out() @@ -242,6 +250,7 @@ class CloneThread(threading.Thread): if self.__cback and not self.__cancelled: gobject.idle_add(self.__cback, self.__radio, emsg)

+ if __name__ == "__main__": d = CloneSettingsDialog("/dev/ttyUSB0") r = d.run() diff --git a/chirpui/cloneprog.py b/chirpui/cloneprog.py index 7427bd2..99beea9 100644 --- a/chirpui/cloneprog.py +++ b/chirpui/cloneprog.py @@ -15,15 +15,16 @@

import gtk

+ class CloneProg(gtk.Window): def __init__(self, **args): - if args.has_key("parent"): + if "parent" in args: parent = args["parent"] del args["parent"] else: parent = None

- if args.has_key("cancel"): + if "cancel" in args: cancel = args["cancel"] del args["cancel"] else: @@ -34,7 +35,7 @@ class CloneProg(gtk.Window): self.set_transient_for(parent) self.set_modal(True) self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) - self.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + self.set_position(gtk.WIN_POS_CENTER_ON_PARENT)

vbox = gtk.VBox(False, 2) vbox.show() diff --git a/chirpui/config.py b/chirpui/config.py index d7b0337..29a4bf2 100644 --- a/chirpui/config.py +++ b/chirpui/config.py @@ -17,6 +17,7 @@ from chirp import platform from ConfigParser import ConfigParser import os

+ class ChirpConfig: def __init__(self, basepath, name="chirp.config"): self.__basepath = basepath @@ -60,6 +61,7 @@ class ChirpConfig: if not self.__config.items(section): self.__config.remove_section(section)

+ class ChirpConfigProxy: def __init__(self, config, section="global"): self._config = config @@ -95,7 +97,7 @@ class ChirpConfigProxy: raise ValueError("Value is not an integer")

self.set(key, "%i" % value, section) - + def get_bool(self, key, section=None, default=False): val = self.get(key, section) if val is None: @@ -112,7 +114,10 @@ class ChirpConfigProxy: def remove_option(self, key, section): self._config.remove_option(section, key)

+ _CONFIG = None + + def get(section="global"): global _CONFIG

diff --git a/chirpui/dstaredit.py b/chirpui/dstaredit.py index df0baa8..75d05b1 100644 --- a/chirpui/dstaredit.py +++ b/chirpui/dstaredit.py @@ -21,9 +21,10 @@ from chirpui import common, miscwidgets WIDGETW = 80 WIDGETH = 30

+ class CallsignEditor(gtk.HBox): __gsignals__ = { - "changed" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()), + "changed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()), }

def _cs_changed(self, listw, callid): @@ -35,10 +36,10 @@ class CallsignEditor(gtk.HBox): return True

def make_list(self, width): - cols = [ (gobject.TYPE_INT, ""), - (gobject.TYPE_INT, ""), - (gobject.TYPE_STRING, _("Callsign")), - ] + cols = [(gobject.TYPE_INT, ""), + (gobject.TYPE_INT, ""), + (gobject.TYPE_STRING, _("Callsign")), + ]

self.listw = miscwidgets.KeyedListWidget(cols) self.listw.show() @@ -54,7 +55,7 @@ class CallsignEditor(gtk.HBox): sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) sw.add_with_viewport(self.listw) sw.show() - + return sw

def __init__(self, first_fixed=False, width=8): @@ -90,6 +91,7 @@ class CallsignEditor(gtk.HBox):

return calls

+ class DStarEditor(common.Editor): def __cs_changed(self, cse): job = None @@ -149,7 +151,7 @@ class DStarEditor(common.Editor): return box

def focus(self): - if self.loaded: + if self.loaded: return self.loaded = True print "Loading callsigns..." @@ -186,7 +188,7 @@ class DStarEditor(common.Editor): self.editor_ucall = self.editor_rcall = None

vbox = gtk.VBox(False, 2) - vbox.pack_start(self.make_callsigns(), 0, 0, 0) + vbox.pack_start(self.make_callsigns(), 0, 0, 0)

tmp = gtk.Label("") tmp.show() diff --git a/chirpui/inputdialog.py b/chirpui/inputdialog.py index a5c2def..a276c2d 100644 --- a/chirpui/inputdialog.py +++ b/chirpui/inputdialog.py @@ -18,6 +18,7 @@ import gtk from miscwidgets import make_choice from chirpui import reporting

+ class TextInputDialog(gtk.Dialog): def respond_ok(self, _): self.response(gtk.RESPONSE_OK) @@ -31,7 +32,7 @@ class TextInputDialog(gtk.Dialog): self.label.set_size_request(300, 100) # pylint: disable-msg=E1101 self.vbox.pack_start(self.label, 1, 1, 0) - + self.text = gtk.Entry() self.text.connect("activate", self.respond_ok, None) # pylint: disable-msg=E1101 @@ -40,6 +41,7 @@ class TextInputDialog(gtk.Dialog): self.label.show() self.text.show()

+ class ChoiceDialog(gtk.Dialog): editable = False

@@ -66,6 +68,7 @@ class ChoiceDialog(gtk.Dialog):

self.set_default_response(gtk.RESPONSE_OK)

+ class EditableChoiceDialog(ChoiceDialog): editable = True

@@ -74,6 +77,7 @@ class EditableChoiceDialog(ChoiceDialog):

self.choice.child.set_activates_default(True)

+ class ExceptionDialog(gtk.MessageDialog): def __init__(self, exception, **args): gtk.MessageDialog.__init__(self, buttons=gtk.BUTTONS_OK, @@ -88,6 +92,7 @@ class ExceptionDialog(gtk.MessageDialog): traceback.print_exc(limit=100, file=sys.stdout) print "----------------------------"

+ class FieldDialog(gtk.Dialog): def __init__(self, **kwargs): if "buttons" not in kwargs.keys(): @@ -118,12 +123,13 @@ class FieldDialog(gtk.Dialog):

# pylint: disable-msg=E1101 self.vbox.pack_start(box, 0, 0, 0) - + self.__fields[label] = widget

def get_field(self, label): return self.__fields.get(label, None)

+ class OverwriteDialog(gtk.MessageDialog): def __init__(self, filename): gtk.Dialog.__init__(self, diff --git a/chirpui/shiftdialog.py b/chirpui/shiftdialog.py index 0ca50a4..e3f0454 100644 --- a/chirpui/shiftdialog.py +++ b/chirpui/shiftdialog.py @@ -16,11 +16,11 @@

import gtk import gobject - import threading

from chirp import errors, chirp_common

+ class ShiftDialog(gtk.Dialog): def __init__(self, rthread, parent=None): gtk.Dialog.__init__(self, @@ -80,7 +80,7 @@ class ShiftDialog(gtk.Dialog):

pos = start while pos <= ulimit: - self.status(_("Looking for a free spot ({number})").format(\ + self.status(_("Looking for a free spot ({number})").format( number=pos), 0) try: mem = self.rthread.radio.get_memory(pos) @@ -126,7 +126,8 @@ class ShiftDialog(gtk.Dialog): if self.quiet: gobject.idle_add(self.response, gtk.RESPONSE_OK) else: - gobject.idle_add(self.set_response_sensitive, gtk.RESPONSE_OK, True) + gobject.idle_add(self.set_response_sensitive, + gtk.RESPONSE_OK, True)

def threadfn(self, newhole, func, *args): self.status("Waiting for radio to become available", 0) diff --git a/rpttool b/rpttool index 5cf7540..60cc4c8 100755 --- a/rpttool +++ b/rpttool @@ -22,6 +22,7 @@ import commands

from chirp import idrp, chirp_common

+ def open_device(): try: s = serial.Serial(port="/dev/icom", @@ -35,6 +36,7 @@ def open_device():

return rp

+ def read_freq(): rp = open_device() if not rp: @@ -50,6 +52,7 @@ def read_freq():

return mem.freq

+ def _set_freq(rp): try: mem = rp.get_memory(0) @@ -81,6 +84,7 @@ def _set_freq(rp): chirp_common.format_freq(mem.freq) return True

+ def set_freq(): rp = open_device() if not rp: @@ -91,10 +95,11 @@ def set_freq(): except Exception, e: print "Unknown error while setting frequency: %s" % e res = False - + rp.pipe.close() return res

+ def main_menu(): print "Looking for a repeater...", sys.stdout.flush() @@ -114,7 +119,7 @@ Current Setting: %s 3. Quit --------------------------------

""" % chirp_common.format_freq(freq),

- + cmd = sys.stdin.readline().strip()

if cmd == "1": @@ -124,9 +129,10 @@ Current Setting: %s freq = read_freq() elif cmd != "3": print "Invalid entry" - + return 0

+ if __name__ == "__main__": if os.path.exists("tools/icomsio.sh"): path = "tools/icomsio.sh" diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 5e8f29b..39b452f 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -15,8 +15,6 @@ ./chirp/bitwise_grammar.py ./chirp/bjuv55.py ./chirp/chirp_common.py -./chirp/detect.py -./chirp/directory.py ./chirp/elib_intl.py ./chirp/errors.py ./chirp/ft1802.py @@ -31,8 +29,6 @@ ./chirp/ft90.py ./chirp/ftm350.py ./chirp/generic_csv.py -./chirp/generic_tpe.py -./chirp/generic_xml.py ./chirp/h777.py ./chirp/ic208.py ./chirp/ic2100.py @@ -62,14 +58,11 @@ ./chirp/kguv8d.py ./chirp/kyd.py ./chirp/leixen.py -./chirp/memmap.py ./chirp/platform.py ./chirp/puxing.py ./chirp/pyPEG.py -./chirp/radioreference.py ./chirp/rfinder.py ./chirp/settings.py -./chirp/template.py ./chirp/th9800.py ./chirp/th_uv3r.py ./chirp/th_uv3r25.py @@ -79,7 +72,6 @@ ./chirp/tk8102.py ./chirp/tmv71.py ./chirp/tmv71_ll.py -./chirp/util.py ./chirp/uv5r.py ./chirp/uvb5.py ./chirp/vx170.py @@ -96,15 +88,10 @@ ./chirp/xml_ll.py ./chirp/yaesu_clone.py ./chirpui/bankedit.py -./chirpui/clone.py -./chirpui/cloneprog.py ./chirpui/common.py -./chirpui/config.py -./chirpui/dstaredit.py ./chirpui/editorset.py ./chirpui/fips.py ./chirpui/importdialog.py -./chirpui/inputdialog.py ./chirpui/mainapp.py ./chirpui/memdetail.py ./chirpui/memedit.py @@ -112,10 +99,8 @@ ./chirpui/radiobrowser.py ./chirpui/reporting.py ./chirpui/settingsedit.py -./chirpui/shiftdialog.py ./csvdump/csvapp.py ./csvdump/csvdump.py -./rpttool ./setup.py ./share/make_supported.py ./tests/run_tests

# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID aeb2e080edb948f01397cda51cbc8903b2be52a2

Fix style issues in setup.py (#2355)

This patch brings setup.py into conformance with PEP8 rules and removes it from the blacklist. It also rewrites the staticify_chirp_module routine to be more idiomatic.

diff --git a/setup.py b/setup.py index 28c4eb3..b923670 100644 --- a/setup.py +++ b/setup.py @@ -6,15 +6,16 @@ from chirp import CHIRP_VERSION from chirp import * import chirp

+ def staticify_chirp_module(): import chirp

- init = file("chirp/__init__.py", "w") - print >>init, "CHIRP_VERSION = "%s"" % CHIRP_VERSION - print >>init, "__all__ = %s\n" % str(chirp.__all__) - init.close() + with file("chirp/__init__.py", "w") as init: + print >>init, "CHIRP_VERSION = "%s"" % CHIRP_VERSION + print >>init, "__all__ = %s\n" % str(chirp.__all__) + + print "Set chirp/__init__.py::__all__ = %s" % str(chirp.__all__)

- print "Set chirp.py::__all__ = %s" % str(chirp.__all__)

def win32_build(): from distutils.core import setup @@ -26,7 +27,7 @@ def win32_build(): import win32com for p in win32com.__path__[1:]: modulefinder.AddPackagePath("win32com", p) - for extra in ["win32com.shell"]: #,"win32com.mapi" + for extra in ["win32com.shell"]: # ,"win32com.mapi" __import__(extra) m = sys.modules[extra] for p in m.__path__[1:]: @@ -38,13 +39,15 @@ def win32_build(): staticify_chirp_module()

opts = { - "py2exe" : { - "includes" : "pango,atk,gobject,cairo,pangocairo,win32gui,win32com,win32com.shell,email.iterators,email.generator,gio", - - "compressed" : 1, - "optimize" : 2, - "bundle_files" : 3, - # "packages" : "" + "py2exe": { + "includes": "pango,atk,gobject,cairo,pangocairo," + + "win32gui,win32com,win32com.shell," + + "email.iterators,email.generator,gio", + + "compressed": 1, + "optimize": 2, + "bundle_files": 3, + # "packages": "" } }

@@ -55,22 +58,22 @@ def win32_build():

setup( zipfile=None, - windows=[{'script' : "chirpw", + windows=[{'script': "chirpw", 'icon_resources': [(0x0004, 'share/chirp.ico')], - }], + }], options=opts)

+ def macos_build(): from setuptools import setup import shutil

APP = ['chirp-%s.py' % CHIRP_VERSION] shutil.copy("chirpw", APP[0]) - DATA_FILES = [('../Frameworks', - ['/opt/local/lib/libpangox-1.0.dylib']), - ('../Resources/', ['/opt/local/lib/pango']), + DATA_FILES = [('../Frameworks', ['/opt/local/lib/libpangox-1.0.dylib']), + ('../Resources/', ['/opt/local/lib/pango']), ] - OPTIONS = {'argv_emulation': True, "includes" : "gtk,atk,pangocairo,cairo"} + OPTIONS = {'argv_emulation': True, "includes": "gtk,atk,pangocairo,cairo"}

setup( app=APP, @@ -79,9 +82,11 @@ def macos_build(): setup_requires=['py2app'], )

- EXEC = 'bash ./build/macos/make_pango.sh /opt/local dist/chirp-%s.app' % CHIRP_VERSION + EXEC = 'bash ./build/macos/make_pango.sh ' + \ + '/opt/local dist/chirp-%s.app' % CHIRP_VERSION #print "exec string: %s" % EXEC - os.system(EXEC) + os.system(EXEC) +

def default_build(): from distutils.core import setup @@ -117,9 +122,10 @@ def default_build(): ('share/chirp/stock_configs', stock_configs), ] + locale_files)

+ def rpttool_build(): from distutils.core import setup - + setup(name="rpttool", packages=["chirp"], version="0.3", @@ -128,6 +134,7 @@ def rpttool_build(): data_files=[('/usr/sbin', ["tools/icomsio.sh"])], )

+ def nuke_manifest(*files): for i in ["MANIFEST", "MANIFEST.in"]: if os.path.exists(i): @@ -140,7 +147,8 @@ def nuke_manifest(*files): for fn in files: print >>f, fn f.close() - + + if sys.platform == "darwin": macos_build() elif sys.platform == "win32": @@ -157,4 +165,3 @@ else: "include stock_configs/*", "include COPYING") default_build() - diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 91f4275..5dd6174 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -92,7 +92,6 @@ ./chirpui/reporting.py ./csvdump/csvapp.py ./csvdump/csvdump.py -./setup.py ./share/make_supported.py ./tests/run_tests ./tests/unit/test_import_logic.py

# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID ec876b2c27ad8f72d1881fe505edcb8985c693ec

Allow run_tests to be run from anywhere (#2343)

Find the path to run_tests, then chdir into the tests directory.

diff --git a/tests/run_tests b/tests/run_tests index 0c3b15b..2dae5e5 100755 --- a/tests/run_tests +++ b/tests/run_tests @@ -19,7 +19,10 @@ import traceback, sys, os, shutil, glob, tempfile, time from optparse import OptionParser from serial import Serial

-# Assume we're running in the tests/ directory of the archive +# change to the tests directory +scriptdir = os.path.dirname(sys.argv[0]) +os.chdir(scriptdir) + sys.path.insert(0, "../")

from chirp import CHIRP_VERSION