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

Fix style issues in run_tests (#2355)

The run_tests script contains logic to set the path for importing the chirp modules. This violates the style rule that all module-level imports must be at the top of the file, so I added it as an exception for this file.

diff --git a/tests/run_tests b/tests/run_tests index c6d801e..7edeecc 100755 --- a/tests/run_tests +++ b/tests/run_tests @@ -15,7 +15,13 @@ # 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 traceback, sys, os, shutil, glob, tempfile, time +import traceback +import sys +import os +import shutil +import glob +import tempfile +import time from optparse import OptionParser from serial import Serial

@@ -27,20 +33,23 @@ sys.path.insert(0, "../")

from chirp import CHIRP_VERSION from chirp import * -from chirp import chirp_common, directory, generic_csv, import_logic, memmap, settings -from chirp import errors +from chirp import chirp_common, directory, generic_csv +from chirp import import_logic, memmap, settings, errors

TESTS = {}

time.sleep = lambda s: None

+ class TestError(Exception): def get_detail(self): return str(self)

+ class TestInternalError(TestError): pass

+ class TestCrashError(TestError): def __init__(self, tb, exc, args): Exception.__init__(self, str(exc)) @@ -58,10 +67,10 @@ class TestCrashError(TestError): self.__tb + os.linesep + \ "Called from:" + os.linesep + self.__mytb

- def get_original_exception(self): return self.__exc

+ class TestFailedError(TestError): def __init__(self, msg, detail=""): TestError.__init__(self, msg) @@ -70,12 +79,15 @@ class TestFailedError(TestError): def get_detail(self): return self._detail

+ class TestSkippedError(TestError): pass

+ def get_tb(): return traceback.format_exc()

+ class TestWrapper: def __init__(self, dstclass, filename): self._ignored_exceptions = [] @@ -120,8 +132,8 @@ class TestWrapper: for arg in args: if isinstance(arg, chirp_common.Memory): details += os.linesep + \ - os.linesep.join(["%s:%s" % (k,v) \ - for k,v in arg.__dict__.items()]) + os.linesep.join(["%s:%s" % (k, v) for k, v + in arg.__dict__.items()]) raise TestCrashError(get_tb(), e, details)

if self._make_reload: @@ -140,6 +152,7 @@ class TestWrapper: def get_radio(self): return self._dst

+ class TestCase: def __init__(self, wrapper): self._wrapper = wrapper @@ -162,12 +175,12 @@ class TestCase:

for k, v in a.__dict__.items(): if k == "power": - continue # FIXME + continue # FIXME elif k == "immutable": continue elif k == "name": if not rf.has_name: - continue # Don't complain about name, if not supported + continue # Don't complain about name, if not supported else: # Name mismatch fair if filter_name() is right v = self._wrapper.do("filter_name", v).rstrip() @@ -177,24 +190,24 @@ class TestCase: a.tmode == "Tone" or (a.tmode == "TSQL" and not rf.has_ctone) or (a.tmode == "Cross" and tx_mode == "Tone") or - (a.tmode == "Cross" and rx_mode == "Tone" and not rf.has_ctone) + (a.tmode == "Cross" and rx_mode == "Tone" and + not rf.has_ctone) ): continue elif k == "ctone" and (not rf.has_ctone or - not ( - a.tmode == "TSQL" or - (a.tmode == "Cross" and rx_mode == "Tone") - ) - ): + not (a.tmode == "TSQL" or + (a.tmode == "Cross" and + rx_mode == "Tone"))): continue elif k == "dtcs" and not ( - (a.tmode == "DTCS" and not rf.has_rx_dtcs) or - (a.tmode == "Cross" and tx_mode == "DTCS") or - (a.tmode == "Cross" and rx_mode == "DTCS" and not rf.has_rx_dtcs) - ): + (a.tmode == "DTCS" and not rf.has_rx_dtcs) or + (a.tmode == "Cross" and tx_mode == "DTCS") or + (a.tmode == "Cross" and rx_mode == "DTCS" and + not rf.has_rx_dtcs)): continue elif k == "rx_dtcs" and (not rf.has_rx_dtcs or - not (a.tmode == "Cross" and rx_mode == "DTCS")): + not (a.tmode == "Cross" and + rx_mode == "DTCS")): continue elif k == "offset" and not a.duplex: continue @@ -209,17 +222,18 @@ class TestCase:

details = msg details += os.linesep + "### Wanted:" + os.linesep - details += os.linesep.join(["%s:%s" % (k,v) for k,v in \ - a.__dict__.items()]) + details += os.linesep.join(["%s:%s" % (k, v) for k, v + in a.__dict__.items()]) details += os.linesep + "### Got:" + os.linesep - details += os.linesep.join(["%s:%s" % (k,v) for k,v in \ - b.__dict__.items()]) + details += os.linesep.join(["%s:%s" % (k, v) for k, v + in b.__dict__.items()]) raise TestFailedError(msg, details) except KeyError, e: print sorted(a.__dict__.keys()) print sorted(b.__dict__.keys()) raise

+ class TestCaseCopyAll(TestCase): "Copy Memories From CSV"

@@ -245,9 +259,9 @@ class TestCaseCopyAll(TestCase):

try: dst_mem = import_logic.import_mem(self._wrapper.get_radio(), - src_rf, - src_mem, - overrides={"number":dst_number}) + src_rf, src_mem, + overrides={ + "number": dst_number}) import_logic.import_bank(self._wrapper.get_radio(), self._src, dst_mem, @@ -255,8 +269,8 @@ class TestCaseCopyAll(TestCase): except import_logic.DestNotCompatible: continue except import_logic.ImportError, e: - failures.append(TestFailedError("<%i>: Import Failed: %s" %\ - (dst_number, e))) + failures.append(TestFailedError("<%i>: Import Failed: %s" % + (dst_number, e))) continue except Exception, e: raise TestCrashError(get_tb(), e, "[Import]") @@ -267,11 +281,13 @@ class TestCaseCopyAll(TestCase): try: self.compare_mem(dst_mem, ret_mem) except TestFailedError, e: - failures.append(TestFailedError("<%i>: %s" % (number, e), e.get_detail())) + failures.append( + TestFailedError("<%i>: %s" % (number, e), e.get_detail()))

return failures TESTS["CopyAll"] = TestCaseCopyAll

+ class TestCaseBruteForce(TestCase): def __str__(self): return "BruteForce" @@ -281,7 +297,9 @@ class TestCaseBruteForce(TestCase): if msgs:

raise TestFailedError("Radio did not validate a valid memory", - os.linesep.join(["%s:%s" % (k,v) for k,v in m.__dict__.items()]) + os.linesep + os.linesep.join(msgs)) + os.linesep.join(["%s:%s" % (k, v) for k, v + in m.__dict__.items()]) + + os.linesep + os.linesep.join(msgs))

self._wrapper.do("set_memory", m) ret_m = self._wrapper.do("get_memory", m.number) @@ -289,7 +307,8 @@ class TestCaseBruteForce(TestCase): # Damned Baofeng radios don't seem to properly store # shift and direction, so be gracious here if m.duplex == "split" and ret_m.duplex in ["-", "+"]: - ret_m.offset = ret_m.freq + (ret_m.offset * int(ret_m.duplex + "1")) + ret_m.offset = ret_m.freq + \ + (ret_m.offset * int(ret_m.duplex + "1")) ret_m.duplex = "split"

self.compare_mem(m, ret_m) @@ -301,7 +320,7 @@ class TestCaseBruteForce(TestCase): if tmode not in chirp_common.TONE_MODES: continue elif tmode in ["DTCS", "DTCS-R", "Cross"]: - continue # We'll test DCS and Cross tones separately + continue # We'll test DCS and Cross tones separately

m.tmode = tmode if tmode == "": @@ -413,6 +432,7 @@ class TestCaseBruteForce(TestCase):

def run(self): rf = self._wrapper.do("get_features") + def clean_mem(): m = chirp_common.Memory() m.number = rf.memory_bounds[0] @@ -444,6 +464,7 @@ class TestCaseBruteForce(TestCase): return [] TESTS["BruteForce"] = TestCaseBruteForce

+ class TestCaseEdges(TestCase): def __str__(self): return "Edges" @@ -458,7 +479,7 @@ class TestCaseEdges(TestCase):

def do_longname(self, rf): m = self._mem(rf) - m.name = ("X" * 256) # Should be longer than any radio can handle + m.name = ("X" * 256) # Should be longer than any radio can handle m.name = self._wrapper.do("filter_name", m.name)

self._wrapper.do("set_memory", m) @@ -489,9 +510,9 @@ class TestCaseEdges(TestCase):

def do_oddsteps(self, rf): odd_steps = { - 145 : [145.85625, 145.86250], - 445 : [445.85625, 445.86250], - 862 : [862.73125, 862.73750], + 145: [145.85625, 145.86250], + 445: [445.85625, 445.86250], + 862: [862.73125, 862.73750], }

m = self._mem(rf) @@ -510,7 +531,6 @@ class TestCaseEdges(TestCase): n = self._wrapper.do("get_memory", m.number) self.compare_mem(m, n)

- def run(self): rf = self._wrapper.do("get_features")

@@ -526,6 +546,7 @@ class TestCaseEdges(TestCase):

TESTS["Edges"] = TestCaseEdges

+ class TestCaseSettings(TestCase): def __str__(self): return "Settings" @@ -606,9 +627,8 @@ class TestCaseBanks(TestCase): # Truncation is allowed, but not failure if not testname.lower().startswith(str(newbanks[i]).lower()): raise TestFailedError("Bank names not properly truncated", - "Tried: %s on %i\nGot: %s" % (testname, - i, - newbanks[i])) + "Tried: %s on %i\nGot: %s" % + (testname, i, newbanks[i]))

def do_bank_names_no_trailing_whitespace(self, rf): banks, newbanks = self._do_bank_names(rf, "foo ") @@ -635,9 +655,8 @@ class TestCaseBanks(TestCase):

mem_banks = model.get_memory_mappings(mem) if len(mem_banks) != 0: - raise TestFailedError("Freshly-created memory has banks and " +\ - "should not", - "Banks: %s" % str(mem_banks)) + raise TestFailedError("Freshly-created memory has banks and " + + "should not", "Banks: %s" % str(mem_banks))

banks = model.get_mappings()

@@ -654,10 +673,10 @@ class TestCaseBanks(TestCase): reason = verify(banks[0]) if reason is not None: raise TestFailedError("Setting memory bank does not persist", - "%s\nMemory banks:%s\nBank memories:%s" %\ - (reason, - model.get_memory_mappings(mem), - model.get_mapping_memories(banks[0]))) + "%s\nMemory banks:%s\nBank memories:%s" % + (reason, + model.get_memory_mappings(mem), + model.get_mapping_memories(banks[0])))

model.remove_memory_from_mapping(mem, banks[0]) reason = verify(banks[0]) @@ -672,8 +691,8 @@ class TestCaseBanks(TestCase): did_error = True

if not did_error: - raise TestFailedError("Removing memory from non-member bank " +\ - "did not raise Exception") + raise TestFailedError("Removing memory from non-member bank " + + "did not raise Exception")

def do_bank_index(self, rf): if not rf.has_bank_index: @@ -697,7 +716,7 @@ class TestCaseBanks(TestCase): raise TestFailedError("Bank index not persisted")

suggested_index = model.get_next_mapping_index(banks[0]) - if suggested_index not in range(*index_bounds): + if suggested_index not in range(*index_bounds): raise TestFailedError("Suggested bank index not in valid range", "Got %i, range is %s" % (suggested_index, index_bounds)) @@ -712,13 +731,15 @@ class TestCaseBanks(TestCase): self.do_bank_names_toolong(rf) self.do_bank_names_no_trailing_whitespace(rf) self.do_bank_store(rf) - self.do_bank_store(rf) # Again to make sure we clear bank info on delete + # Again to make sure we clear bank info on delete + self.do_bank_store(rf) self.do_bank_index(rf)

return []

TESTS["Banks"] = TestCaseBanks

+ class TestCaseDetect(TestCase): def __str__(self): return "Detect" @@ -737,31 +758,37 @@ class TestCaseDetect(TestCase): if issubclass(self._wrapper._dstclass, radio.__class__): pass elif radio.__class__ != self._wrapper._dstclass: - raise TestFailedError("%s detected as %s" % \ - (self._wrapper._dstclass, - radio.__class__)) + raise TestFailedError("%s detected as %s" % + (self._wrapper._dstclass, radio.__class__)) return []

TESTS["Detect"] = TestCaseDetect

+ class TestCaseClone(TestCase): class SerialNone: def read(self, size): return "" + def write(self, data): pass + def setBaudrate(self, rate): pass + def setTimeout(self, timeout): pass + def setParity(self, parity): pass + def __str__(self): - return self.__class__.__name__.replace("Serial","") + return self.__class__.__name__.replace("Serial", "")

class SerialError(SerialNone): def read(self, size): raise Exception("Foo") + def write(self, data): raise Exception("Bar")

@@ -797,7 +824,7 @@ class TestCaseClone(TestCase): if not isinstance(error, errors.RadioError): raise TestFailedError("Live radio didn't notice serial " + "was dead on init") - return [] # Nothing more to test on an error'd live radio + return [] # Nothing more to test on an error'd live radio

error = None try: @@ -812,8 +839,9 @@ class TestCaseClone(TestCase): elif not isinstance(error, errors.RadioError): raise TestFailedError("Radio did not raise RadioError " + "with %s data" % serial, - "sync_in() Got: %s (%s)\n%s" % (\ - error.__class__.__name__, error, get_tb())) + "sync_in() Got: %s (%s)\n%s" % + (error.__class__.__name__, + error, get_tb()))

radio._mmap = memmap.MemoryMap("\x00" * (1024 * 128))

@@ -830,8 +858,8 @@ class TestCaseClone(TestCase): elif not isinstance(error, errors.RadioError): raise TestFailedError("Radio did not raise RadioError " + "with %s data" % serial, - "sync_out(): Got: %s (%s)" % (\ - error.__class__.__name__, error)) + "sync_out(): Got: %s (%s)" % + (error.__class__.__name__, error))

return []

@@ -844,11 +872,13 @@ class TestCaseClone(TestCase):

TESTS["Clone"] = TestCaseClone

+ class TestOutput: def __init__(self, output=None): if not output: output = sys.stdout self._out = output + def prepare(self): pass

@@ -865,14 +895,15 @@ class TestOutput: tc, msg, e))

+ class TestOutputANSI(TestOutput): def __init__(self, output=None): TestOutput.__init__(self, output) self.__counts = { - "PASSED" : 0, - "FAILED" : 0, - "CRASHED" : 0, - "SKIPPED" : 0, + "PASSED": 0, + "FAILED": 0, + "CRASHED": 0, + "SKIPPED": 0, } self.__total = 0

@@ -898,9 +929,10 @@ class TestOutputANSI(TestOutput): self._print("-" * 70) self._print("Results:") self._print(" %-7s: %i" % ("TOTAL", self.__total)) - for t,c in self.__counts.items(): + for t, c in self.__counts.items(): self._print(" %-7s: %i" % (t, c))

+ class TestOutputHTML(TestOutput): def __init__(self, filename): self._filename = filename @@ -946,7 +978,8 @@ td.SKIPPED { <h3>Generated on %s (%s)</h3> <table class="testlist"> <tr> - <th>Vendor</th><th>Model</th><th>Test Case</th><th>Status</th><th>Message</th> + <th>Vendor</th><th>Model</th><th>Test Case</th> + <th>Status</th><th>Message</th> </tr> """ % (CHIRP_VERSION, CHIRP_VERSION, time.strftime("%x at %X"), os.name) print >>self._out, s @@ -959,15 +992,17 @@ td.SKIPPED { def report(self, rclass, tc, msg, e): s = ("<tr class='%s'>" % msg) + \ ("<td class='vendor'>%s</td>" % rclass.VENDOR) + \ - ("<td class='model'>%s %s</td>" % (rclass.MODEL, rclass.VARIANT))+\ + ("<td class='model'>%s %s</td>" % + (rclass.MODEL, rclass.VARIANT)) + \ ("<td class='tc'>%s</td>" % tc) + \ - ("<td class='%s'>%s</td>" % (msg,msg)) + \ + ("<td class='%s'>%s</td>" % (msg, msg)) + \ ("<td class='error'>%s</td>" % e) + \ "</tr>" print >>self._out, s sys.stdout.write(".") sys.stdout.flush()

+ class TestRunner: def __init__(self, images_dir, test_list, test_out): self._images_dir = images_dir @@ -1007,7 +1042,7 @@ class TestRunner: nfailed = 0 for tcclass in self._test_list: nprinted = 0 - tw = TestWrapper(rclass,parm) + tw = TestWrapper(rclass, parm) tc = tcclass(tw)

self.nuke_log(rclass, tc) diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 5dd6174..1df7274 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -93,7 +93,6 @@ ./csvdump/csvapp.py ./csvdump/csvdump.py ./share/make_supported.py -./tests/run_tests ./tests/unit/test_import_logic.py ./tests/unit/test_memedit_edits.py ./tests/unit/test_settings.py diff --git a/tools/cpep8.exceptions b/tools/cpep8.exceptions index 6fcce63..394634f 100644 --- a/tools/cpep8.exceptions +++ b/tools/cpep8.exceptions @@ -2,3 +2,4 @@ # Each line must contain the file name, a tab, and a comma-separated list # of style rules to ignore in that file. This mechanism should be used # sparingly and as a measure of last resort. +./tests/run_tests E402

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

Fix style issues in csvdump scripts (#2355)

diff --git a/csvdump/csvapp.py b/csvdump/csvapp.py index 2d675cc..aaae614 100644 --- a/csvdump/csvapp.py +++ b/csvdump/csvapp.py @@ -24,19 +24,19 @@ import os import csvdump from chirpui import inputdialog, cloneprog

-gobject.threads_init() - import chirp from chirp import ic9x, id800, ic2820, ic2200, errors - from chirp import platform

-RADIOS = { "ic9x:A": ic9x.IC9xRadioA, - "ic9x:B": ic9x.IC9xRadioB, - "id800" : id800.ID800v2Radio, - "ic2820": ic2820.IC2820Radio, - "ic2200": ic2200.IC2200Radio, -} +gobject.threads_init() + +RADIOS = {"ic9x:A": ic9x.IC9xRadioA, + "ic9x:B": ic9x.IC9xRadioB, + "id800": id800.ID800v2Radio, + "ic2820": ic2820.IC2820Radio, + "ic2200": ic2200.IC2200Radio, + } +

class CsvDumpApp: def update_status(self, s): @@ -57,7 +57,7 @@ class CsvDumpApp:

print "Sync done, saving to: %s" % fn radio.save_mmap(fn) - + self.refresh_radio() except serial.SerialException, e: gobject.idle_add(self.mainwin.set_status, @@ -107,7 +107,7 @@ class CsvDumpApp: def upload_img(self): t = threading.Thread(target=self._upload_img) t.start() - + def _export_file_mmap(self, fname): count = 0

@@ -173,7 +173,6 @@ class CsvDumpApp: return low, high else: return None, None -

def export_file(self, fname): if not fname.lower().endswith(".csv"): @@ -185,7 +184,7 @@ class CsvDumpApp: return

t = threading.Thread(target=self._export_file_live, - args=(fname,l,h)) + args=(fname, l, h)) t.start() else: self._export_file_mmap(fname) @@ -200,7 +199,7 @@ class CsvDumpApp: except Exception, e: print "Failed to parse `%s': %s" % (line, e) return None - + return m

def _import_file_live(self, fname): @@ -226,7 +225,7 @@ class CsvDumpApp: continue except Exception, e: print "Parse error on line %i: %s" % (lineno, e) - break # FIXME: Report error here + break # FIXME: Report error here

lineno += 1 memories.append(m) @@ -242,7 +241,7 @@ class CsvDumpApp: # try: # self.radio.get_memory(m.number, 2) # except errors.InvalidMemoryLocation: -# m +# m

try: self.radio.set_memory(m) @@ -333,7 +332,7 @@ class CsvDumpApp: self.rtype = radio self.rport = port self.refresh_radio() - + def __init__(self): self.mainwin = csvdump.CsvDumpWindow(self.select_radio, self.download_img, @@ -344,7 +343,7 @@ class CsvDumpApp: self.progwin = cloneprog.CloneProg() self.progwin.set_transient_for(self.mainwin) self.progwin.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) - + self.radio = None

def run(self): @@ -353,6 +352,7 @@ class CsvDumpApp:

gtk.main()

+ if __name__ == "__main__": a = CsvDumpApp() a.run() diff --git a/csvdump/csvdump.py b/csvdump/csvdump.py index 3b1f550..048cac9 100644 --- a/csvdump/csvdump.py +++ b/csvdump/csvdump.py @@ -19,7 +19,8 @@ import gtk

from chirp import platform

-RADIOS = [ "ic2820", "id800", "ic9x:A", "ic9x:B", "ic2200" ] +RADIOS = ["ic2820", "id800", "ic9x:A", "ic9x:B", "ic2200"] +

def make_choice(options, editable=True, default=None): if editable: @@ -39,12 +40,14 @@ def make_choice(options, editable=True, default=None):

return sel

+ class StdButton(gtk.Button): def __init__(self, *args): gtk.Button.__init__(self, *args)

self.set_size_request(75, 25)

+ class CsvDumpWindow(gtk.Window): def set_image_info(self, canUpload, canCsv, info): self.w_imginfo.set_text(info) @@ -66,16 +69,16 @@ class CsvDumpWindow(gtk.Window):

hbox = gtk.HBox(False, 2) hbox.set_border_width(2) - + self.w_radio = make_choice(RADIOS, False, RADIOS[0]) self.w_radio.connect("changed", self.select_radio) self.tips.set_tip(self.w_radio, "Select radio model") self.w_radio.show() - hbox.pack_start(self.w_radio, 1,1,1) + hbox.pack_start(self.w_radio, 1, , )

l = gtk.Label(" on port ") l.show() - hbox.pack_start(l, 0,0,0) + hbox.pack_start(l, 0, , )

ports = platform.get_platform().list_serial_ports() if len(ports) > 0: @@ -86,7 +89,7 @@ class CsvDumpWindow(gtk.Window): self.w_port.connect("changed", self.select_radio) self.tips.set_tip(self.w_port, "Select serial port") self.w_port.show() - hbox.pack_start(self.w_port, 1,1,1) + hbox.pack_start(self.w_port, 1, , )

f.add(hbox) hbox.show() @@ -102,7 +105,7 @@ class CsvDumpWindow(gtk.Window):

self.w_imginfo = gtk.Label("No image") self.w_imginfo.show() - vbox.pack_start(self.w_imginfo, 0,0,0) + vbox.pack_start(self.w_imginfo, 0, , )

hbox = gtk.HBox(True, 2) hbox.set_border_width(2) @@ -111,17 +114,17 @@ class CsvDumpWindow(gtk.Window): self.w_dli.connect("clicked", lambda x: self.fn_download()) self.tips.set_tip(self.w_dli, "Download image from radio") self.w_dli.show() - hbox.pack_start(self.w_dli, 0,0,0) + hbox.pack_start(self.w_dli, 0, , )

self.w_uli = StdButton("Upload") self.w_uli.set_sensitive(False) self.w_uli.connect("clicked", lambda x: self.fn_upload()) self.tips.set_tip(self.w_uli, "Upload image to radio") self.w_uli.show() - hbox.pack_start(self.w_uli, 0,0,0) + hbox.pack_start(self.w_uli, 0, , )

hbox.show() - vbox.pack_start(hbox, 0,0,0) + vbox.pack_start(hbox, 0, , )

vbox.show() self.w_imgframe.add(vbox) @@ -151,45 +154,47 @@ class CsvDumpWindow(gtk.Window):

l = gtk.Label("File") l.show() - hbox.pack_start(l, 0,0,0) + hbox.pack_start(l, 0, , )

self.w_filename = gtk.Entry() self.w_filename.connect("changed", self.file_changed) self.tips.set_tip(self.w_filename, "Path to CSV file") self.w_filename.show() - hbox.pack_start(self.w_filename, 1,1,1) - + hbox.pack_start(self.w_filename, 1, , ) + bb = StdButton("Browse") bb.connect("clicked", self.pick_file) bb.show() - hbox.pack_start(bb, 0,0,0) + hbox.pack_start(bb, 0, , )

hbox.show() - vbox.pack_start(hbox, 0,0,0) + vbox.pack_start(hbox, 0, , )

hbox = gtk.HBox(True, 2) hbox.set_border_width(2)

+ def export_handler(x): + return self.fn_eport(self.w_filename.get_text()) self.w_export = StdButton("Export") self.w_export.set_sensitive(False) - self.w_export.connect("clicked", - lambda x: self.fn_eport(self.w_filename.get_text())) + self.w_export.connect("clicked", export_handler) self.tips.set_tip(self.w_export, "Export radio memories to CSV file") self.w_export.show() - hbox.pack_start(self.w_export, 0,0,0) + hbox.pack_start(self.w_export, 0, , )

+ def import_handler(x): + return self.fn_iport(self.w_filename.get_text()) self.w_import = StdButton("Import") self.w_import.set_sensitive(False) - self.w_import.connect("clicked", - lambda x: self.fn_iport(self.w_filename.get_text())) + self.w_import.connect("clicked", import_handler) self.tips.set_tip(self.w_import, "Import radio memories from CSV file") self.w_import.show() - hbox.pack_start(self.w_import, 0,0,0) + hbox.pack_start(self.w_import, 0, , )

hbox.show() - vbox.pack_start(hbox, 0,0,0) + vbox.pack_start(hbox, 0, , )

vbox.show() self.w_fileframe.add(vbox) @@ -220,10 +225,10 @@ class CsvDumpWindow(gtk.Window):

vbox = gtk.VBox(False, 2)

- vbox.pack_start(self.make_radio_sel(), 0,0,0) - vbox.pack_start(self.make_image_ctl(), 0,0,0) - vbox.pack_start(self.make_file_ctl(), 0,0,0) - vbox.pack_start(self.make_status_bar(), 0,0,0) + vbox.pack_start(self.make_radio_sel(), 0, , ) + vbox.pack_start(self.make_image_ctl(), 0, , ) + vbox.pack_start(self.make_file_ctl(), 0, , ) + vbox.pack_start(self.make_status_bar(), 0, , )

vbox.show() self.add(vbox) diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 5cf2b23..3d7e95c 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -90,8 +90,6 @@ ./chirpui/memedit.py ./chirpui/miscwidgets.py ./chirpui/reporting.py -./csvdump/csvapp.py -./csvdump/csvdump.py ./share/make_supported.py ./tools/bitdiff.py ./tools/img2thd72.py

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

Fix style issues in chirp_common.py (#2355)

diff --git a/chirp/chirp_common.py b/chirp/chirp_common.py index 5c4e4f3..1566cc5 100644 --- a/chirp/chirp_common.py +++ b/chirp/chirp_common.py @@ -13,24 +13,21 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

-SEPCHAR = "," - -#print "Using separation character of '%s'" % SEPCHAR - import math - from chirp import errors, memmap

+SEPCHAR = "," + # 50 Tones -TONES = [ 67.0, 69.3, 71.9, 74.4, 77.0, 79.7, 82.5, - 85.4, 88.5, 91.5, 94.8, 97.4, 100.0, 103.5, - 107.2, 110.9, 114.8, 118.8, 123.0, 127.3, - 131.8, 136.5, 141.3, 146.2, 151.4, 156.7, - 159.8, 162.2, 165.5, 167.9, 171.3, 173.8, - 177.3, 179.9, 183.5, 186.2, 189.9, 192.8, - 196.6, 199.5, 203.5, 206.5, 210.7, 218.1, - 225.7, 229.1, 233.6, 241.8, 250.3, 254.1, - ] +TONES = [67.0, 69.3, 71.9, 74.4, 77.0, 79.7, 82.5, + 85.4, 88.5, 91.5, 94.8, 97.4, 100.0, 103.5, + 107.2, 110.9, 114.8, 118.8, 123.0, 127.3, + 131.8, 136.5, 141.3, 146.2, 151.4, 156.7, + 159.8, 162.2, 165.5, 167.9, 171.3, 173.8, + 177.3, 179.9, 183.5, 186.2, 189.9, 192.8, + 196.6, 199.5, 203.5, 206.5, 210.7, 218.1, + 225.7, 229.1, 233.6, 241.8, 250.3, 254.1, + ]

TONES_EXTRA = [62.5]

@@ -40,8 +37,8 @@ OLD_TONES = list(TONES)

# 104 DTCS Codes DTCS_CODES = [ - 23, 25, 26, 31, 32, 36, 43, 47, 51, 53, 54, - 65, 71, 72, 73, 74, 114, 115, 116, 122, 125, 131, + 23, 25, 26, 31, 32, 36, 43, 47, 51, 53, 54, + 65, 71, 72, 73, 74, 114, 115, 116, 122, 125, 131, 132, 134, 143, 145, 152, 155, 156, 162, 165, 172, 174, 205, 212, 223, 225, 226, 243, 244, 245, 246, 251, 252, 255, 261, 263, 265, 266, 271, 274, 306, 311, 315, 325, @@ -50,7 +47,7 @@ DTCS_CODES = [ 465, 466, 503, 506, 516, 523, 526, 532, 546, 565, 606, 612, 624, 627, 631, 632, 654, 662, 664, 703, 712, 723, 731, 732, 734, 743, 754, - ] + ]

# 512 Possible DTCS Codes ALL_DTCS_CODES = [] @@ -90,7 +87,7 @@ TUNING_STEPS = [ 9.0, 1.0, 2.5, ]

-SKIP_VALUES = [ "", "S", "P" ] +SKIP_VALUES = ["", "S", "P"]

CHARSET_UPPER_NUMERIC = "ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890" CHARSET_ALPHANUMERIC = \ @@ -143,14 +140,17 @@ APRS_SYMBOLS = ( "TDB", "[reserved]" )

+ def watts_to_dBm(watts): """Converts @watts in watts to dBm""" return int(10 * math.log10(int(watts * 1000)))

+ def dBm_to_watts(dBm): """Converts @dBm from dBm to watts""" return int(math.pow(10, (dBm - 30) / 10))

+ class PowerLevel: """Represents a power level supported by a radio""" def __init__(self, label, watts=0, dBm=0): @@ -188,6 +188,7 @@ class PowerLevel: def __repr__(self): return "%s (%i dBm)" % (self._label, self._power)

+ def parse_freq(freqstr): """Parse a frequency string and return the value in integral Hz""" freqstr = freqstr.strip() @@ -213,14 +214,17 @@ def parse_freq(freqstr):

return mhz + khz

+ def format_freq(freq): """Format a frequency given in Hz as a string"""

return "%i.%06i" % (freq / 1000000, freq % 1000000)

+ class ImmutableValueError(ValueError): pass

+ class Memory: """Base class for a single radio memory""" freq = 0 @@ -279,18 +283,18 @@ class Memory: self.immutable = []

_valid_map = { - "rtone" : TONES + TONES_EXTRA, - "ctone" : TONES + TONES_EXTRA, - "dtcs" : ALL_DTCS_CODES, - "rx_dtcs" : ALL_DTCS_CODES, - "tmode" : TONE_MODES, - "dtcs_polarity" : ["NN", "NR", "RN", "RR"], - "cross_mode" : CROSS_MODES, - "mode" : MODES, - "duplex" : ["", "+", "-", "split", "off"], - "skip" : SKIP_VALUES, - "empty" : [True, False], - "dv_code" : [x for x in range(0, 100)], + "rtone": TONES + TONES_EXTRA, + "ctone": TONES + TONES_EXTRA, + "dtcs": ALL_DTCS_CODES, + "rx_dtcs": ALL_DTCS_CODES, + "tmode": TONE_MODES, + "dtcs_polarity": ["NN", "NR", "RN", "RR"], + "cross_mode": CROSS_MODES, + "mode": MODES, + "duplex": ["", "+", "-", "split", "off"], + "skip": SKIP_VALUES, + "empty": [True, False], + "dv_code": [x for x in range(0, 100)], }

def __repr__(self): @@ -324,10 +328,9 @@ class Memory: raise ImmutableValueError("Field %s is not " % name + "mutable on this memory")

- if self._valid_map.has_key(name) and val not in self._valid_map[name]: - raise ValueError("`%s' is not in valid list: %s" % (\ - val, - self._valid_map[name])) + if name in self._valid_map and val not in self._valid_map[name]: + raise ValueError("`%s' is not in valid list: %s" % + (val, self._valid_map[name]))

self.__dict__[name] = val

@@ -361,7 +364,7 @@ class Memory: else: dup = self.duplex

- return "Memory %i: %s%s%s %s (%s) r%.1f%s c%.1f%s d%03i%s%s [%.2f]"% \ + return "Memory %i: %s%s%s %s (%s) r%.1f%s c%.1f%s d%03i%s%s [%.2f]" % \ (self.number, format_freq(self.freq), dup, @@ -380,20 +383,20 @@ class Memory: def to_csv(self): """Return a CSV representation of this memory""" return [ - "%i" % self.number, - "%s" % self.name, + "%i" % self.number, + "%s" % self.name, format_freq(self.freq), - "%s" % self.duplex, + "%s" % self.duplex, format_freq(self.offset), - "%s" % self.tmode, + "%s" % self.tmode, "%.1f" % self.rtone, "%.1f" % self.ctone, "%03i" % self.dtcs, - "%s" % self.dtcs_polarity, - "%s" % self.mode, + "%s" % self.dtcs_polarity, + "%s" % self.mode, "%.2f" % self.tuning_step, - "%s" % self.skip, - "%s" % self.comment, + "%s" % self.skip, + "%s" % self.comment, "", "", "", ""]

@classmethod @@ -442,7 +445,8 @@ class Memory:

self.tmode = vals[5] if self.tmode not in TONE_MODES: - raise errors.InvalidDataError("Invalid tone mode `%s'" % self.tmode) + raise errors.InvalidDataError("Invalid tone mode `%s'" % + self.tmode)

try: self.rtone = float(vals[6]) @@ -494,6 +498,7 @@ class Memory:

return True

+ class DVMemory(Memory): """A Memory with D-STAR attributes""" dv_urcall = "CQCQCQ" @@ -512,24 +517,24 @@ class DVMemory(Memory):

def to_csv(self): return [ - "%i" % self.number, - "%s" % self.name, + "%i" % self.number, + "%s" % self.name, format_freq(self.freq), - "%s" % self.duplex, + "%s" % self.duplex, format_freq(self.offset), - "%s" % self.tmode, + "%s" % self.tmode, "%.1f" % self.rtone, "%.1f" % self.ctone, "%03i" % self.dtcs, - "%s" % self.dtcs_polarity, - "%s" % self.mode, + "%s" % self.dtcs_polarity, + "%s" % self.mode, "%.2f" % self.tuning_step, - "%s" % self.skip, + "%s" % self.skip, "%s" % self.comment, - "%s" % self.dv_urcall, - "%s" % self.dv_rpt1call, - "%s" % self.dv_rpt2call, - "%i" % self.dv_code] + "%s" % self.dv_urcall, + "%s" % self.dv_rpt1call, + "%s" % self.dv_rpt2call, + "%i" % self.dv_code]

def really_from_csv(self, vals): Memory.really_from_csv(self, vals) @@ -542,6 +547,7 @@ class DVMemory(Memory): except Exception: self.dv_code = 0

+ class MemoryMapping(object): """Base class for a memory mapping""" def __init__(self, model, index, name): @@ -566,6 +572,7 @@ class MemoryMapping(object): def __eq__(self, other): return self.get_index() == other.get_index()

+ class MappingModel(object): """Base class for a memory mapping model"""

@@ -602,20 +609,24 @@ class MappingModel(object): """Return a list of mappings that @memory is in""" raise NotImplementedError()

+ class Bank(MemoryMapping): """Base class for a radio's Bank"""

+ class NamedBank(Bank): """A bank that can have a name""" def set_name(self, name): """Changes the user-adjustable bank name""" self._name = name

+ class BankModel(MappingModel): """A bank model where one memory is in zero or one banks at any point""" def __init__(self, radio, name='Banks'): super(BankModel, self).__init__(radio, name)

+ class MappingModelIndexInterface: """Interface for mappings with index capabilities""" def get_index_bounds(self): @@ -635,10 +646,12 @@ class MappingModelIndexInterface: Exception if full""" raise NotImplementedError()

+ class MTOBankModel(BankModel): """A bank model where one memory can be in multiple banks at once """ pass

+ def console_status(status): """Write a status object to the console""" import sys @@ -656,76 +669,77 @@ class RadioPrompts:

BOOLEAN = [True, False]

+ class RadioFeatures: """Radio Feature Flags""" _valid_map = { # General - "has_bank_index" : BOOLEAN, - "has_dtcs" : BOOLEAN, - "has_rx_dtcs" : BOOLEAN, - "has_dtcs_polarity" : BOOLEAN, - "has_mode" : BOOLEAN, - "has_offset" : BOOLEAN, - "has_name" : BOOLEAN, - "has_bank" : BOOLEAN, - "has_bank_names" : BOOLEAN, - "has_tuning_step" : BOOLEAN, - "has_ctone" : BOOLEAN, - "has_cross" : BOOLEAN, - "has_infinite_number" : BOOLEAN, - "has_nostep_tuning" : BOOLEAN, - "has_comment" : BOOLEAN, - "has_settings" : BOOLEAN, + "has_bank_index": BOOLEAN, + "has_dtcs": BOOLEAN, + "has_rx_dtcs": BOOLEAN, + "has_dtcs_polarity": BOOLEAN, + "has_mode": BOOLEAN, + "has_offset": BOOLEAN, + "has_name": BOOLEAN, + "has_bank": BOOLEAN, + "has_bank_names": BOOLEAN, + "has_tuning_step": BOOLEAN, + "has_ctone": BOOLEAN, + "has_cross": BOOLEAN, + "has_infinite_number": BOOLEAN, + "has_nostep_tuning": BOOLEAN, + "has_comment": BOOLEAN, + "has_settings": BOOLEAN,

# Attributes - "valid_modes" : [], - "valid_tmodes" : [], - "valid_duplexes" : [], - "valid_tuning_steps" : [], - "valid_bands" : [], - "valid_skips" : [], - "valid_power_levels" : [], - "valid_characters" : "", - "valid_name_length" : 0, - "valid_cross_modes" : [], - "valid_dtcs_pols" : [], - "valid_dtcs_codes" : [], - "valid_special_chans" : [], - - "has_sub_devices" : BOOLEAN, - "memory_bounds" : (0, 0), - "can_odd_split" : BOOLEAN, + "valid_modes": [], + "valid_tmodes": [], + "valid_duplexes": [], + "valid_tuning_steps": [], + "valid_bands": [], + "valid_skips": [], + "valid_power_levels": [], + "valid_characters": "", + "valid_name_length": 0, + "valid_cross_modes": [], + "valid_dtcs_pols": [], + "valid_dtcs_codes": [], + "valid_special_chans": [], + + "has_sub_devices": BOOLEAN, + "memory_bounds": (0, 0), + "can_odd_split": BOOLEAN,

# D-STAR - "requires_call_lists" : BOOLEAN, - "has_implicit_calls" : BOOLEAN, + "requires_call_lists": BOOLEAN, + "has_implicit_calls": BOOLEAN, }

def __setattr__(self, name, val): if name.startswith("_"): self.__dict__[name] = val return - elif not name in self._valid_map.keys(): + elif name not in self._valid_map.keys(): raise ValueError("No such attribute `%s'" % name)

if type(self._valid_map[name]) == tuple: # Tuple, cardinality must match if type(val) != tuple or len(val) != len(self._valid_map[name]): - raise ValueError("Invalid value `%s' for attribute `%s'" % \ - (val, name)) + raise ValueError("Invalid value `%s' for attribute `%s'" % + (val, name)) elif type(self._valid_map[name]) == list and not self._valid_map[name]: # Empty list, must be another list if type(val) != list: - raise ValueError("Invalid value `%s' for attribute `%s'" % \ - (val, name)) + raise ValueError("Invalid value `%s' for attribute `%s'" % + (val, name)) elif type(self._valid_map[name]) == str: if type(val) != str: - raise ValueError("Invalid value `%s' for attribute `%s'" % \ - (val, name)) + raise ValueError("Invalid value `%s' for attribute `%s'" % + (val, name)) elif type(self._valid_map[name]) == int: if type(val) != int: - raise ValueError("Invalid value `%s' for attribute `%s'" % \ - (val, name)) + raise ValueError("Invalid value `%s' for attribute `%s'" % + (val, name)) elif val not in self._valid_map[name]: # Value not in the list of valid values raise ValueError("Invalid value `%s' for attribute `%s'" % (val, @@ -753,7 +767,8 @@ class RadioFeatures: self.init("has_dtcs", True, "Indicates that DTCS tone mode is available") self.init("has_rx_dtcs", False, - "Indicates that radio can use two different DTCS codes for rx and tx") + "Indicates that radio can use two different " + + "DTCS codes for rx and tx") self.init("has_dtcs_polarity", True, "Indicates that the DTCS polarity can be changed") self.init("has_mode", True, @@ -851,8 +866,8 @@ class RadioFeatures: msgs.append(msg)

if (self.valid_modes and - mem.mode not in self.valid_modes and - mem.mode != "Auto"): + mem.mode not in self.valid_modes and + mem.mode != "Auto"): msg = ValidationError("Mode %s not supported" % mem.mode) msgs.append(msg)

@@ -863,14 +878,14 @@ class RadioFeatures: if mem.tmode == "Cross": if self.valid_cross_modes and \ mem.cross_mode not in self.valid_cross_modes: - msg = ValidationError("Cross tone mode %s not supported" % \ - mem.cross_mode) + msg = ValidationError("Cross tone mode %s not supported" % + mem.cross_mode) msgs.append(msg)

if self.has_dtcs_polarity and \ mem.dtcs_polarity not in self.valid_dtcs_pols: - msg = ValidationError("DTCS Polarity %s not supported" % \ - mem.dtcs_polarity) + msg = ValidationError("DTCS Polarity %s not supported" % + mem.dtcs_polarity) msgs.append(msg)

if self.valid_dtcs_codes and \ @@ -912,8 +927,8 @@ class RadioFeatures: try: step = required_step(mem.freq) if step not in self.valid_tuning_steps: - msg = ValidationError("Frequency requires %.2fkHz step" %\ - required_step(mem.freq)) + msg = ValidationError("Frequency requires %.2fkHz step" % + required_step(mem.freq)) msgs.append(msg) except errors.InvalidDataError, e: msgs.append(str(e)) @@ -928,18 +943,22 @@ class RadioFeatures:

return msgs

+ class ValidationMessage(str): """Base class for Validation Errors and Warnings""" pass

+ class ValidationWarning(ValidationMessage): """A non-fatal warning during memory validation""" pass

+ class ValidationError(ValidationMessage): """A fatal error during memory validation""" pass

+ class Radio(object): """Base class for all Radio drivers""" BAUD_RATE = 9600 @@ -1042,6 +1061,7 @@ class Radio(object): should be True and get_settings() must be implemented as well.""" pass

+ class FileBackedRadio(Radio): """A file-backed radio stores its data in a file""" FILE_EXTENSION = "img" @@ -1086,7 +1106,6 @@ class FileBackedRadio(Radio): return self._mmap

- class CloneModeRadio(FileBackedRadio): """A clone-mode radio does a full memory dump in and out and we store an image of the radio into an image file""" @@ -1131,16 +1150,19 @@ class CloneModeRadio(FileBackedRadio): "Initiate a PC-to-radio clone operation" pass

+ class LiveRadio(Radio): """Base class for all Live-Mode radios""" pass

+ class NetworkSourceRadio(Radio): """Base class for all radios based on a network source""" def do_fetch(self): """Fetch the source data from the network""" pass

+ class IcomDstarSupport: """Base interface for radios supporting Icom's D-STAR technology""" MYCALL_LIMIT = (1, 1) @@ -1171,6 +1193,7 @@ class IcomDstarSupport: """Set the MYCALL callsign list""" pass

+ class ExperimentalRadio: """Interface for experimental radios""" @classmethod @@ -1178,6 +1201,7 @@ class ExperimentalRadio: return ("This radio's driver is marked as experimental and may " + "be unstable or unsafe to use.")

+ class Status: """Clone status object for conveying clone progress to the UI""" name = "Job" @@ -1196,26 +1220,32 @@ class Status:

return "|%-10s| %2.1f%% %s" % (ticks, pct, self.msg)

+ def is_fractional_step(freq): """Returns True if @freq requires a 12.5kHz or 6.25kHz step""" return not is_5_0(freq) and (is_12_5(freq) or is_6_25(freq))

+ def is_5_0(freq): """Returns True if @freq is reachable by a 5kHz step""" return (freq % 5000) == 0

+ def is_12_5(freq): """Returns True if @freq is reachable by a 12.5kHz step""" return (freq % 12500) == 0

+ def is_6_25(freq): """Returns True if @freq is reachable by a 6.25kHz step""" return (freq % 6250) == 0

+ def is_2_5(freq): """Returns True if @freq is reachable by a 2.5kHz step""" return (freq % 2500) == 0

+ def required_step(freq): """Returns the simplest tuning step that is required to reach @freq""" if is_5_0(freq): @@ -1228,9 +1258,9 @@ def required_step(freq): return 2.5 else: raise errors.InvalidDataError("Unable to calculate the required " + - "tuning step for %i.%5i" % \ - (freq / 1000000, - freq % 1000000)) + "tuning step for %i.%5i" % + (freq / 1000000, freq % 1000000)) +

def fix_rounded_step(freq): """Some radios imply the last bit of 12.5kHz and 6.25kHz step @@ -1259,8 +1289,9 @@ def fix_rounded_step(freq): except errors.InvalidDataError: pass

- raise errors.InvalidDataError("Unable to correct rounded frequency " + \ - format_freq(freq)) + raise errors.InvalidDataError("Unable to correct rounded frequency " + + format_freq(freq)) +

def _name(name, len, just_upper): """Justify @name to @len, optionally converting to all uppercase""" @@ -1268,42 +1299,52 @@ def _name(name, len, just_upper): name = name.upper() return name.ljust(len)[:len]

+ def name6(name, just_upper=True): """6-char name""" return _name(name, 6, just_upper)

+ def name8(name, just_upper=False): """8-char name""" return _name(name, 8, just_upper)

+ def name16(name, just_upper=False): """16-char name""" return _name(name, 16, just_upper)

+ def to_GHz(val): """Convert @val in GHz to Hz""" return val * 1000000000

+ def to_MHz(val): """Convert @val in MHz to Hz""" return val * 1000000

+ def to_kHz(val): """Convert @val in kHz to Hz""" return val * 1000

+ def from_GHz(val): """Convert @val in Hz to GHz""" return val / 100000000

+ def from_MHz(val): """Convert @val in Hz to MHz""" return val / 100000

+ def from_kHz(val): """Convert @val in Hz to kHz""" return val / 100

+ def split_tone_decode(mem, txtone, rxtone): """ Set tone mode and values on @mem based on txtone and rxtone specs like: @@ -1349,6 +1390,7 @@ def split_tone_decode(mem, txtone, rxtone): elif rxmode == "DTCS": mem.rx_dtcs = rxval

+ def split_tone_encode(mem): """ Returns TX, RX tone specs based on @mem like: diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index aad6343..5213d75 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -13,7 +13,6 @@ ./chirp/baofeng_uv3r.py ./chirp/bitwise.py ./chirp/bjuv55.py -./chirp/chirp_common.py ./chirp/elib_intl.py ./chirp/ft1802.py ./chirp/ft1d.py

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

Fix style issues in settings.py (#2355)

diff --git a/chirp/settings.py b/chirp/settings.py index c0fbe92..5d8f3ee 100644 --- a/chirp/settings.py +++ b/chirp/settings.py @@ -15,14 +15,17 @@

from chirp import chirp_common

+ class InvalidValueError(Exception): """An invalid value was specified for a given setting""" pass

+ class InternalError(Exception): """A driver provided an invalid settings object structure""" pass

+ class RadioSettingValue: """Base class for a single radio setting""" def __init__(self): @@ -49,7 +52,7 @@ class RadioSettingValue: if not self.get_mutable(): raise InvalidValueError("This value is not mutable")

- if self._current != None and value != self._current: + if self._current is not None and value != self._current: self._has_changed = True self._current = self._validate_callback(value)

@@ -63,6 +66,7 @@ class RadioSettingValue: def __str__(self): return str(self.get_value())

+ class RadioSettingValueInteger(RadioSettingValue): """An integer setting""" def __init__(self, minval, maxval, current, step=1): @@ -78,9 +82,8 @@ class RadioSettingValueInteger(RadioSettingValue): except: raise InvalidValueError("An integer is required") if value > self._max or value < self._min: - raise InvalidValueError("Value %i not in range %i-%i" % (value, - self._min, - self._max)) + raise InvalidValueError("Value %i not in range %i-%i" % + (value, self._min, self._max)) RadioSettingValue.set_value(self, value)

def get_min(self): @@ -95,6 +98,7 @@ class RadioSettingValueInteger(RadioSettingValue): """Returns the step increment""" return self._step

+ class RadioSettingValueFloat(RadioSettingValue): """A floating-point setting""" def __init__(self, minval, maxval, current, resolution=0.001, precision=4): @@ -122,7 +126,7 @@ class RadioSettingValueFloat(RadioSettingValue): raise InvalidValueError("Value %s not in range %s-%s" % ( self.format(value), self.format(self._min), self.format(self._max))) - + # FIXME: honor resolution

RadioSettingValue.set_value(self, value) @@ -134,6 +138,7 @@ class RadioSettingValueFloat(RadioSettingValue): def get_max(self): """Returns the maximum allowed value"""

+ class RadioSettingValueBoolean(RadioSettingValue): """A boolean setting""" def __init__(self, current): @@ -150,6 +155,7 @@ class RadioSettingValueBoolean(RadioSettingValue): def __str__(self): return str(bool(self.get_value()))

+ class RadioSettingValueList(RadioSettingValue): """A list-of-strings setting""" def __init__(self, options, current): @@ -158,7 +164,7 @@ class RadioSettingValueList(RadioSettingValue): self.set_value(current)

def set_value(self, value): - if not value in self._options: + if value not in self._options: raise InvalidValueError("%s is not valid for this setting" % value) RadioSettingValue.set_value(self, value)

@@ -169,6 +175,7 @@ class RadioSettingValueList(RadioSettingValue): def __trunc__(self): return self._options.index(self._current)

+ class RadioSettingValueString(RadioSettingValue): """A string setting""" def __init__(self, minlength, maxlength, current, @@ -186,8 +193,8 @@ class RadioSettingValueString(RadioSettingValue):

def set_value(self, value): if len(value) < self._minlength or len(value) > self._maxlength: - raise InvalidValueError("Value must be between %i and %i chars" % (\ - self._minlength, self._maxlength)) + raise InvalidValueError("Value must be between %i and %i chars" % + (self._minlength, self._maxlength)) if self._autopad: value = value.ljust(self._maxlength) for char in value: @@ -204,6 +211,7 @@ class RadioSettings(list): def __init__(self, *groups): list.__init__(self, groups)

+ class RadioSettingGroup(object): """A group of settings""" def _validate(self, element): @@ -212,12 +220,12 @@ class RadioSettingGroup(object): raise InternalError("Incorrect type %s" % type(element))

def __init__(self, name, shortname, *elements): - self._name = name # Setting identifier - self._shortname = shortname # Short human-readable name/description - self.__doc__ = name # Longer explanation/documentation + self._name = name # Setting identifier + self._shortname = shortname # Short human-readable name/description + self.__doc__ = name # Longer explanation/documentation self._elements = {} self._element_order = [] - + for element in elements: self._validate(element) self.append(element) @@ -250,16 +258,19 @@ class RadioSettingGroup(object): def __iter__(self): class RSGIterator: """Iterator for a RadioSettingGroup""" + def __init__(self, rsg): self.__rsg = rsg self.__i = 0 + def __iter__(self): return self + def next(self): """Next Iterator Interface""" if self.__i >= len(self.__rsg.keys()): raise StopIteration() - e = self.__rsg[self.__rsg.keys()[self.__i]] + e = self.__rsg[self.__rsg.keys()[self.__i]] self.__i += 1 return e return RSGIterator(self) @@ -290,6 +301,7 @@ class RadioSettingGroup(object): """Returns the list of elements""" return [self._elements[name] for name in self._element_order]

+ class RadioSetting(RadioSettingGroup): """A single setting, which could be an array of items like a group""" def __init__(self, *args): @@ -311,7 +323,8 @@ class RadioSetting(RadioSettingGroup): raise InternalError("Incorrect type")

def changed(self): - """Returns True if any of the elements in the group have been changed""" + """Returns True if any of the elements + in the group have been changed""" for element in self._elements.values(): if element.changed(): return True @@ -341,7 +354,7 @@ class RadioSetting(RadioSettingGroup): raise InternalError("Setting %s is not a scalar" % self._name) else: self.__dict__[name] = value - + # List interface

def append(self, value): @@ -357,8 +370,7 @@ class RadioSetting(RadioSettingGroup): def __setitem__(self, name, value): if not isinstance(name, int): raise IndexError("Index `%s' is not an integer" % name) - if self._elements.has_key(name): + if name in self._elements: self._elements[name].set_value(value) else: self._elements[name] = value - diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index d33c735..a564989 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -55,7 +55,6 @@ ./chirp/puxing.py ./chirp/pyPEG.py ./chirp/rfinder.py -./chirp/settings.py ./chirp/th9800.py ./chirp/th_uv3r.py ./chirp/th_uv3r25.py

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

Fix style issues in pyPEG.py (#2355)

diff --git a/chirp/pyPEG.py b/chirp/pyPEG.py index 5faa637..68d8b74 100644 --- a/chirp/pyPEG.py +++ b/chirp/pyPEG.py @@ -3,36 +3,52 @@ # written by VB.

import re -import sys, codecs +import sys +import codecs import exceptions

-class keyword(unicode): pass -class code(unicode): pass + +class keyword(unicode): + pass + + +class code(unicode): + pass + + class ignore(object): def __init__(self, regex_text, *args): self.regex = re.compile(regex_text, *args)

+ class _and(object): def __init__(self, something): self.obj = something

-class _not(_and): pass + +class _not(_and): + pass +

class Name(unicode): def __init__(self, *args): self.line = 0 self.file = u""

+ class Symbol(list): def __init__(self, name, what): self.__name__ = name self.append(name) self.what = what self.append(what) + def __call__(self): return self.what + def __unicode__(self): return u'Symbol(' + repr(self.__name__) + ', ' + repr(self.what) + u')' + def __repr__(self): return unicode(self)

@@ -41,6 +57,7 @@ rest_regex = re.compile(ur".*")

print_trace = False

+ def u(text): if isinstance(text, exceptions.BaseException): text = text.args[0] @@ -53,6 +70,7 @@ def u(text): return codecs.decode(text, "utf-8") return unicode(text)

+ def skip(skipper, text, skipWS, skipComments): if skipWS: t = text.lstrip() @@ -64,12 +82,14 @@ def skip(skipper, text, skipWS, skipComments): skip, t = skipper.parseLine(t, skipComments, [], skipWS, None) if skipWS: t = t.lstrip() - except: pass + except: + pass return t

+ class parser(object): - def __init__(self, another = False, p = False): - self.restlen = -1 + def __init__(self, another=False, p=False): + self.restlen = -1 if not(another): self.skipper = parser(True, p) self.skipper.packrat = p @@ -86,15 +106,17 @@ class parser(object): # resultSoFar: parsing result so far (default: blank list []) # skipWS: Flag if whitespace should be skipped (default: True) # skipComments: Python functions returning pyPEG for matching comments - # + # # returns: pyAST, textrest # - # raises: SyntaxError(reason) if textline is detected not being in language - # described by pattern + # raises: SyntaxError(reason) if textline is detected not + # being in language described by pattern # - # SyntaxError(reason) if pattern is an illegal language description + # SyntaxError(reason) if pattern is an illegal + # language description

- def parseLine(self, textline, pattern, resultSoFar = [], skipWS = True, skipComments = None): + def parseLine(self, textline, pattern, resultSoFar=[], + skipWS=True, skipComments=None): name = None _textline = textline _pattern = pattern @@ -104,8 +126,10 @@ class parser(object): if print_trace: try: if _pattern.__name__ != "comment": - sys.stderr.write(u"match: " + _pattern.__name__ + u"\n") - except: pass + sys.stderr.write(u"match: " + + _pattern.__name__ + u"\n") + except: + pass

if self.restlen == -1: self.restlen = len(text) @@ -119,7 +143,7 @@ class parser(object): name.line = self.lineNo() res.append(Symbol(name, [])) elif result: - if type(result) is type([]): + if isinstance(result, list): res.extend(result) else: res.extend([result]) @@ -139,15 +163,19 @@ class parser(object): return result else: raise SyntaxError() - except: pass + except: + pass

if callable(pattern): if __debug__: if print_trace: try: if pattern.__name__ != "comment": - sys.stderr.write(u"testing with " + pattern.__name__ + u": " + textline[:40] + u"\n") - except: pass + sys.stderr.write(u"testing with " + + pattern.__name__ + u": " + + textline[:40] + u"\n") + except: + pass

if pattern.__name__[0] != "_": name = Name(pattern.__name__) @@ -162,7 +190,8 @@ class parser(object):

if pattern_type is str or pattern_type is unicode: if text[:len(pattern)] == pattern: - text = skip(self.skipper, text[len(pattern):], skipWS, skipComments) + text = skip(self.skipper, text[len(pattern):], + skipWS, skipComments) return R(None, text) else: syntaxError() @@ -171,7 +200,8 @@ class parser(object): m = word_regex.match(text) if m: if m.group(0) == pattern: - text = skip(self.skipper, text[len(pattern):], skipWS, skipComments) + text = skip(self.skipper, text[len(pattern):], + skipWS, skipComments) return R(None, text) else: syntaxError() @@ -180,7 +210,8 @@ class parser(object):

elif pattern_type is _not: try: - r, t = self.parseLine(text, pattern.obj, [], skipWS, skipComments) + r, t = self.parseLine(text, pattern.obj, [], + skipWS, skipComments) except: return resultSoFar, textline syntaxError() @@ -194,7 +225,8 @@ class parser(object): pattern = pattern.regex m = pattern.match(text) if m: - text = skip(self.skipper, text[len(m.group(0)):], skipWS, skipComments) + text = skip(self.skipper, text[len(m.group(0)):], + skipWS, skipComments) if pattern_type is ignore: return R(None, text) else: @@ -206,26 +238,29 @@ class parser(object): result = [] n = 1 for p in pattern: - if type(p) is type(0): + if isinstance(p, int): n = p else: - if n>0: + if n > 0: for i in range(n): - result, text = self.parseLine(text, p, result, skipWS, skipComments) - elif n==0: + result, text = self.parseLine( + text, p, result, skipWS, skipComments) + elif n == 0: if text == "": pass else: try: - newResult, newText = self.parseLine(text, p, result, skipWS, skipComments) + newResult, newText = self.parseLine( + text, p, result, skipWS, skipComments) result, text = newResult, newText except SyntaxError: pass - elif n<0: + elif n < 0: found = False while True: try: - newResult, newText = self.parseLine(text, p, result, skipWS, skipComments) + newResult, newText = self.parseLine( + text, p, result, skipWS, skipComments) result, text, found = newResult, newText, True except SyntaxError: break @@ -239,7 +274,8 @@ class parser(object): found = False for p in pattern: try: - result, text = self.parseLine(text, p, result, skipWS, skipComments) + result, text = self.parseLine(text, p, result, + skipWS, skipComments) found = True except SyntaxError: pass @@ -254,8 +290,10 @@ class parser(object): raise SyntaxError(u"illegal type in grammar: " + u(pattern_type))

def lineNo(self): - if not(self.lines): return u"" - if self.restlen == -1: return u"" + if not(self.lines): + return u"" + if self.restlen == -1: + return u"" parsed = self.textlen - self.restlen

left, right = 0, len(self.lines) @@ -266,14 +304,16 @@ class parser(object): try: if self.lines[mid + 1][0] >= parsed: try: - return u(self.lines[mid + 1][1]) + u":" + u(self.lines[mid + 1][2]) + return u(self.lines[mid + 1][1]) + \ + u":" + u(self.lines[mid + 1][2]) except: return u"" else: left = mid + 1 except: try: - return u(self.lines[mid + 1][1]) + u":" + u(self.lines[mid + 1][2]) + return u(self.lines[mid + 1][1]) + \ + u":" + u(self.lines[mid + 1][2]) except: return u"" else: @@ -281,9 +321,12 @@ class parser(object): if left > right: return u""

-# plain module API

-def parseLine(textline, pattern, resultSoFar = [], skipWS = True, skipComments = None, packrat = False): +# plain module APIs + + +def parseLine(textline, pattern, resultSoFar=[], skipWS=True, + skipComments=None, packrat=False): p = parser(p=packrat) text = skip(p.skipper, textline, skipWS, skipComments) ast, text = p.parseLine(text, pattern, resultSoFar, skipWS, skipComments) @@ -296,13 +339,15 @@ def parseLine(textline, pattern, resultSoFar = [], skipWS = True, skipComments = # skipComments: Python function which returns pyPEG for matching comments # packrat: use memoization # lineCount: add line number information to AST -# +# # returns: pyAST # # raises: SyntaxError(reason), if a parsed line is not in language # SyntaxError(reason), if the language description is illegal

-def parse(language, lineSource, skipWS = True, skipComments = None, packrat = False, lineCount = True): + +def parse(language, lineSource, skipWS=True, skipComments=None, + packrat=False, lineCount=True): lines, lineNo = [], 0

while callable(language): @@ -314,7 +359,8 @@ def parse(language, lineSource, skipWS = True, skipComments = None, packrat = Fa ld = 1 else: ld += 1 - lines.append((len(orig), lineSource.filename(), lineSource.lineno() - 1)) + lines.append((len(orig), lineSource.filename(), + lineSource.lineno() - 1)) orig += u(line)

textlen = len(orig) @@ -346,6 +392,7 @@ def parse(language, lineSource, skipWS = True, skipComments = None, packrat = Fa lineNo += 1 nn -= 1 lineCont = orig.splitlines()[nn] - raise SyntaxError(u"syntax error in " + u(file) + u":" + u(lineNo) + u": " + lineCont) + raise SyntaxError(u"syntax error in " + u(file) + u":" + + u(lineNo) + u": " + lineCont)

return result diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 5a9db49..a2e1803 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -52,7 +52,6 @@ ./chirp/kyd.py ./chirp/leixen.py ./chirp/puxing.py -./chirp/pyPEG.py ./chirp/rfinder.py ./chirp/th9800.py ./chirp/th_uv3r.py

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

Fix style issues in chirp module (#2355)

diff --git a/chirp/__init__.py b/chirp/__init__.py index 084af48..7b48821 100644 --- a/chirp/__init__.py +++ b/chirp/__init__.py @@ -13,12 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

-CHIRP_VERSION="0.3.0dev" - import os import sys from glob import glob

+CHIRP_VERSION = "0.3.0dev" + module_dir = os.path.dirname(sys.modules["chirp"].__file__) __all__ = [] for i in glob(os.path.join(module_dir, "*.py")): diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 36f1013..35c48e4 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -1,7 +1,6 @@ # 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

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

Fix style issues in editorset.py (#2355)

diff --git a/chirpui/editorset.py b/chirpui/editorset.py index 520463f..59d82ea 100644 --- a/chirpui/editorset.py +++ b/chirpui/editorset.py @@ -21,18 +21,19 @@ from chirp import chirp_common, directory, generic_csv, generic_xml from chirpui import memedit, dstaredit, bankedit, common, importdialog from chirpui import inputdialog, reporting, settingsedit, radiobrowser, config

+ class EditorSet(gtk.VBox): __gsignals__ = { - "want-close" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()), - "status" : (gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING,)), - "usermsg": (gobject.SIGNAL_RUN_LAST, + "want-close": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()), + "status": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING,)), - "editor-selected" : (gobject.SIGNAL_RUN_LAST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING,)), + "usermsg": (gobject.SIGNAL_RUN_LAST, + gobject.TYPE_NONE, + (gobject.TYPE_STRING,)), + "editor-selected": (gobject.SIGNAL_RUN_LAST, + gobject.TYPE_NONE, + (gobject.TYPE_STRING,)), }

def _make_device_mapping_editors(self, device, devrthread, index): @@ -76,7 +77,7 @@ class EditorSet(gtk.VBox): memories.connect("changed", self.editor_changed)

if self.rf.has_sub_devices: - label = (_("Memories (%(variant)s)") % + label = (_("Memories (%(variant)s)") % dict(variant=device.VARIANT)) rf = device.get_features() else: @@ -97,7 +98,8 @@ class EditorSet(gtk.VBox): editor.connect("changed", self.editor_changed) self.editors["dstar"] = editor

- def __init__(self, source, parent_window=None, filename=None, tempname=None): + def __init__(self, source, parent_window=None, + filename=None, tempname=None): gtk.VBox.__init__(self, True, 0)

self.parent_window = parent_window @@ -146,7 +148,7 @@ class EditorSet(gtk.VBox):

conf = config.get() if (hasattr(self.rthread.radio, '_memobj') and - conf.get_bool("developer", "state")): + conf.get_bool("developer", "state")): editor = radiobrowser.RadioBrowser(self.rthread) lab = gtk.Label(_("Browser")) self.tabs.append_page(editor.root, lab) @@ -197,7 +199,7 @@ class EditorSet(gtk.VBox): if not fname: fname = self.filename if not os.path.exists(self.filename): - return # Probably before the first "Save as" + return # Probably before the first "Save as" else: self.filename = fname

@@ -240,7 +242,7 @@ class EditorSet(gtk.VBox): # interface to queue our own changes before opening it up to the # rest of the world.

- dst_rthread._qlock_when_idle(5) # Suspend job submission when idle + dst_rthread._qlock_when_idle(5) # Suspend job submission when idle

dialog = dlgclass(src_radio, dst_rthread.radio, self.parent_window) r = dialog.run() @@ -265,10 +267,9 @@ class EditorSet(gtk.VBox): choices = [x.VARIANT for x in devices]

d = inputdialog.ChoiceDialog(choices) - d.label.set_text(_("The {vendor} {model} has multiple " - "independent sub-devices").format( \ - vendor=radio.VENDOR, model=radio.MODEL) + os.linesep + \ - _("Choose one to import from:")) + text = _("The {vendor} {model} has multiple independent sub-devices") + d.label.set_text(text.format(vendor=radio.VENDOR, model=radio.MODEL) + + os.linesep + _("Choose one to import from:")) r = d.run() chosen = d.choice.get_active_text() d.destroy() @@ -297,8 +298,10 @@ class EditorSet(gtk.VBox): if isinstance(src_radio, chirp_common.NetworkSourceRadio): ww = importdialog.WaitWindow("Querying...", self.parent_window) ww.show() + def status(status): ww.set(float(status.cur) / float(status.max)) + try: src_radio.status_fn = status src_radio.do_fetch() @@ -331,7 +334,7 @@ class EditorSet(gtk.VBox): common.log_exception() common.show_error(_("There was an error during " "import: {error}").format(error=e)) - + def do_export(self, filen): try: if filen.lower().endswith(".csv"): @@ -373,7 +376,7 @@ class EditorSet(gtk.VBox): common.show_error(_("There was an error during " "export: {error}").format(error=e), self) - + def prime(self): # NOTE: this is only called to prime new CSV files, so assume # only one memory editor for now @@ -389,7 +392,7 @@ class EditorSet(gtk.VBox):

def tab_selected(self, notebook, foo, pagenum): widget = notebook.get_nth_page(pagenum) - for k,v in self.editors.items(): + for k, v in self.editors.items(): if v and v.root == widget: v.focus() self.emit("editor-selected", k) @@ -408,8 +411,9 @@ class EditorSet(gtk.VBox): editor and editor.prepare_close()

def get_current_editor(self): + tabs = self.tabs for lab, e in self.editors.items(): - if e and self.tabs.page_num(e.root) == self.tabs.get_current_page(): + if e and tabs.page_num(e.root) == tabs.get_current_page(): return e raise Exception("No editor selected?")

diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index a805274..2d58449 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -70,7 +70,6 @@ ./chirp/wouxun.py ./chirp/wouxun_common.py ./chirp/yaesu_clone.py -./chirpui/editorset.py ./chirpui/fips.py ./chirpui/importdialog.py ./chirpui/mainapp.py

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

Fix style issues in mainapp.py (#2355)

diff --git a/chirpui/mainapp.py b/chirpui/mainapp.py index e22196a..baff031 100644 --- a/chirpui/mainapp.py +++ b/chirpui/mainapp.py @@ -22,9 +22,17 @@ from glob import glob import shutil import time import logging - import gtk import gobject + +from chirpui import inputdialog, common +from chirp import platform, generic_xml, generic_csv, directory, util +from chirp import ic9x, kenwood_live, idrp, vx7, vx5, vx6 +from chirp import CHIRP_VERSION, chirp_common, detect, errors +from chirp import icf, ic9x_icf +from chirpui import editorset, clone, miscwidgets, config, reporting, fips +from chirpui import bandplans + gobject.threads_init()

LOG = logging.getLogger(__name__) @@ -33,34 +41,29 @@ if __name__ == "__main__": import sys sys.path.insert(0, "..")

-from chirpui import inputdialog, common try: import serial -except ImportError,e: +except ImportError, e: common.log_exception() common.show_error("\nThe Pyserial module is not installed!") -from chirp import platform, generic_xml, generic_csv, directory, util -from chirp import ic9x, kenwood_live, idrp, vx7, vx5, vx6 -from chirp import CHIRP_VERSION, chirp_common, detect, errors -from chirp import icf, ic9x_icf -from chirpui import editorset, clone, miscwidgets, config, reporting, fips -from chirpui import bandplans +

CONF = config.get()

KEEP_RECENT = 8

RB_BANDS = { - "--All--" : 0, - "10 meters (29MHz)" : 29, - "6 meters (54MHz)" : 5, - "2 meters (144MHz)" : 14, - "1.25 meters (220MHz)" : 22, - "70 centimeters (440MHz)" : 4, - "33 centimeters (900MHz)" : 9, - "23 centimeters (1.2GHz)" : 12, + "--All--": 0, + "10 meters (29MHz)": 29, + "6 meters (54MHz)": 5, + "2 meters (144MHz)": 14, + "1.25 meters (220MHz)": 22, + "70 centimeters (440MHz)": 4, + "33 centimeters (900MHz)": 9, + "23 centimeters (1.2GHz)": 12, }

+ def key_bands(band): if band.startswith("-"): return -1 @@ -70,9 +73,11 @@ def key_bands(band):

return 100000 - (float(amount) * scale)

+ class ModifiedError(Exception): pass

+ class ChirpMain(gtk.Window): def get_current_editorset(self): page = self.tabs.get_current_page() @@ -112,7 +117,7 @@ class ChirpMain(gtk.Window):

for i in ["cancelq"]: set_action_sensitive(i, eset is not None and not save_sens) - + for i in ["export", "close", "columns", "irbook", "irfinder", "move_up", "move_dn", "exchange", "iradioreference", "cut", "copy", "paste", "delete", "viewdeveloper", @@ -129,7 +134,7 @@ class ChirpMain(gtk.Window):

def ev_editor_selected(self, editorset, editortype): mappings = { - "memedit" : ["view", "edit"], + "memedit": ["view", "edit"], }

for _editortype, actions in mappings.items(): @@ -159,8 +164,9 @@ class ChirpMain(gtk.Window):

label = gtk.Label("") label.set_markup("<b>-1</b> for either Mem # does a full-file hex " + - "dump with diffs highlighted.\n" + - "<b>-2</b> for first Mem # shows <b>only</b> the diffs.") + "dump with diffs highlighted.\n" + + "<b>-2</b> for first Mem # shows " + + "<b>only</b> the diffs.") d.vbox.pack_start(label, True, True, 0) label.show()

@@ -206,9 +212,9 @@ class ChirpMain(gtk.Window):

print "Selected %s@%i and %s@%i" % (sel_a, sel_chan_a, sel_b, sel_chan_b) - name_a = os.path.basename (sel_a) + name_a = os.path.basename(sel_a) name_a = name_a[:name_a.rindex(")")] - name_b = os.path.basename (sel_b) + name_b = os.path.basename(sel_b) name_b = name_b[:name_b.rindex(")")] diffwintitle = "%s@%i diff %s@%i" % ( name_a, sel_chan_a, name_b, sel_chan_b) @@ -223,14 +229,16 @@ class ChirpMain(gtk.Window):

def _get_mem_b(mem_a): # Step 2: Get memory b - job = common.RadioJob(_show_diff, "get_raw_memory", int(sel_chan_b)) + job = common.RadioJob(_show_diff, "get_raw_memory", + int(sel_chan_b)) job.set_cb_args(mem_a) eset_b.rthread.submit(job) - + if sel_chan_a >= 0 and sel_chan_b >= 0: # Diff numbered memory # Step 1: Get memory a - job = common.RadioJob(_get_mem_b, "get_raw_memory", int(sel_chan_a)) + job = common.RadioJob(_get_mem_b, "get_raw_memory", + int(sel_chan_a)) eset_a.rthread.submit(job) elif isinstance(eset_a.rthread.radio, chirp_common.CloneModeRadio) and\ isinstance(eset_b.rthread.radio, chirp_common.CloneModeRadio): @@ -249,7 +257,7 @@ class ChirpMain(gtk.Window): else: diffsonly = False common.show_diff_blob(diffwintitle, - common.simple_diff(a, b, diffsonly)) + common.simple_diff(a, b, diffsonly)) else: common.show_error("Cannot diff whole live-mode radios!")

@@ -271,7 +279,11 @@ class ChirpMain(gtk.Window):

lab = gtk.Label("""<b><big>Unable to detect model!</big></b>

-If you think that it is valid, you can select a radio model below to force an open attempt. If selecting the model manually works, please file a bug on the website and attach your image. If selecting the model does not work, it is likely that you are trying to open some other type of file. +If you think that it is valid, you can select a radio model below to +force an open attempt. If selecting the model manually works, please +file a bug on the website and attach your image. If selecting the model +does not work, it is likely that you are trying to open some other type +of file. """)

lab.set_justify(gtk.JUSTIFY_FILL) @@ -288,7 +300,7 @@ If you think that it is valid, you can select a radio model below to force an op d.vbox.set_spacing(5) choice.show() d.set_default_size(400, 200) - #d.set_resizable(False) + # d.set_resizable(False) r = d.run() d.destroy() if r != gtk.RESPONSE_OK: @@ -318,7 +330,7 @@ If you think that it is valid, you can select a radio model below to force an op self.record_recent_file(fname)

if icf.is_icf_file(fname): - a = common.ask_yesno_question(\ + a = common.ask_yesno_question( _("ICF files cannot be edited, only displayed or imported " "into another file. Open in read-only mode?"), self) @@ -378,8 +390,8 @@ If you think that it is valid, you can select a radio model below to force an op "to the radio. Because of this, you cannot perform the " "<u>Save</u> or <u>Upload</u> operations. If you wish to " "edit the contents offline, please <u>Export</u> to a CSV " - "file, using the <b>File menu</b>.").format(vendor=radio.VENDOR, - model=radio.MODEL) + "file, using the <b>File menu</b>.") + msg = msg.format(vendor=radio.VENDOR, model=radio.MODEL) d.format_secondary_markup(msg)

again = gtk.CheckButton(_("Don't show this again")) @@ -416,10 +428,10 @@ If you think that it is valid, you can select a radio model below to force an op def do_saveas(self): eset = self.get_current_editorset()

- label = _("{vendor} {model} image file").format(\ + label = _("{vendor} {model} image file").format( vendor=eset.radio.VENDOR, model=eset.radio.MODEL) - + types = [(label + " (*.%s)" % eset.radio.FILE_EXTENSION, eset.radio.FILE_EXTENSION)]

@@ -447,7 +459,7 @@ If you think that it is valid, you can select a radio model below to force an op

try: eset.save(fname) - except Exception,e: + except Exception, e: d = inputdialog.ExceptionDialog(e) d.run() d.destroy() @@ -462,7 +474,7 @@ If you think that it is valid, you can select a radio model below to force an op d.run() d.destroy()

- def cb_cloneout(self, radio, emsg= None): + def cb_cloneout(self, radio, emsg=None): radio.pipe.close() reporting.report_model_usage(radio, "upload", True) if emsg: @@ -477,7 +489,7 @@ If you think that it is valid, you can select a radio model below to force an op if fn: recent.append(fn) return recent - + def _set_recent_list(self, recent): for fn in recent: CONF.set("recent%i" % recent.index(fn), fn, "state") @@ -493,13 +505,12 @@ If you think that it is valid, you can select a radio model below to force an op self.menu_ag.remove_action(old_action)

file_basename = os.path.basename(fname).replace("_", "__") - action = gtk.Action(action_name, - "_%i. %s" % (i+1, file_basename), - _("Open recent file {name}").format(name=fname), - "") - action.connect("activate", lambda a,f: self.do_open(f), fname) + action = gtk.Action( + action_name, "_%i. %s" % (i+1, file_basename), + _("Open recent file {name}").format(name=fname), "") + action.connect("activate", lambda a, f: self.do_open(f), fname) mid = self.menu_uim.new_merge_id() - self.menu_uim.add_ui(mid, path, + self.menu_uim.add_ui(mid, path, action_name, action_name, gtk.UI_MANAGER_MENUITEM, False) self.menu_ag.add_action(action) @@ -575,13 +586,12 @@ If you think that it is valid, you can select a radio model below to force an op _("Open stock " "configuration {name}").format(name=name), "") - action.connect("activate", lambda a,c: self.do_open(c), config) + action.connect("activate", lambda a, c: self.do_open(c), config) mid = self.menu_uim.new_merge_id() mid = self.menu_uim.add_ui(mid, path, action_name, action_name, gtk.UI_MANAGER_MENUITEM, False) self.menu_ag.add_action(action) -

configs = glob(os.path.join(stock_dir, "*.csv")) for config in configs: @@ -619,7 +629,8 @@ If you think that it is valid, you can select a radio model below to force an op msg = _("{instructions}").format(instructions=message) d.format_secondary_markup(msg)

- again = gtk.CheckButton(_("Don't show instructions for any radio again")) + again = gtk.CheckButton( + _("Don't show instructions for any radio again")) again.show() d.vbox.pack_start(again, 0, 0, 0) h_button_box = d.vbox.get_children()[2] @@ -669,7 +680,8 @@ If you think that it is valid, you can select a radio model below to force an op

fn = tempfile.mktemp() if isinstance(radio, chirp_common.CloneModeRadio): - ct = clone.CloneThread(radio, "in", cb=self.cb_clonein, parent=self) + ct = clone.CloneThread(radio, "in", cb=self.cb_clonein, + parent=self) ct.start() else: self.do_open_live(radio) @@ -688,7 +700,7 @@ If you think that it is valid, you can select a radio model below to force an op return prompts = radio.get_prompts()

- if prompts.display_pre_upload_prompt_before_opening_port == True: + if prompts.display_pre_upload_prompt_before_opening_port is True: print "Opening port after pre_upload prompt." self._show_instructions(radio, prompts.pre_upload)

@@ -709,7 +721,7 @@ If you think that it is valid, you can select a radio model below to force an op d.destroy() return

- if prompts.display_pre_upload_prompt_before_opening_port == False: + if prompts.display_pre_upload_prompt_before_opening_port is False: print "Opening port before pre_upload prompt." self._show_instructions(radio, prompts.pre_upload)

@@ -728,11 +740,11 @@ If you think that it is valid, you can select a radio model below to force an op return False

if eset.is_modified(): - dlg = miscwidgets.YesNoDialog(title=_("Save Changes?"), - parent=self, - buttons=(gtk.STOCK_YES, gtk.RESPONSE_YES, - gtk.STOCK_NO, gtk.RESPONSE_NO, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) + dlg = miscwidgets.YesNoDialog( + title=_("Save Changes?"), parent=self, + buttons=(gtk.STOCK_YES, gtk.RESPONSE_YES, + gtk.STOCK_NO, gtk.RESPONSE_NO, + gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) dlg.set_text(_("File is modified, save changes before closing?")) res = dlg.run() dlg.destroy() @@ -744,7 +756,7 @@ If you think that it is valid, you can select a radio model below to force an op

eset.rthread.stop() eset.rthread.join() - + eset.prepare_close()

if eset.radio.pipe: @@ -785,11 +797,11 @@ If you think that it is valid, you can select a radio model below to force an op def do_repeaterbook_prompt(self): if not CONF.get_bool("has_seen_credit", "repeaterbook"): d = gtk.MessageDialog(parent=self, buttons=gtk.BUTTONS_OK) - d.set_markup("<big><big><b>RepeaterBook</b></big>\r\n" + \ - "<i>North American Repeater Directory</i></big>") - d.format_secondary_markup("For more information about this " +\ - "free service, please go to\r\n" +\ - "http://www.repeaterbook.com") + d.set_markup("<big><big><b>RepeaterBook</b></big>\r\n" + + "<i>North American Repeater Directory</i></big>") + d.format_secondary_markup("For more information about this " + + "free service, please go to\r\n" + + "http://www.repeaterbook.com") d.run() d.destroy() CONF.set_bool("has_seen_credit", True, "repeaterbook") @@ -802,19 +814,20 @@ If you think that it is valid, you can select a radio model below to force an op code = int(CONF.get("state", "repeaterbook")) except: code = CONF.get("state", "repeaterbook") - for k,v in fips.FIPS_STATES.items(): + for k, v in fips.FIPS_STATES.items(): if code == v: default_state = k break

code = CONF.get("county", "repeaterbook") - for k,v in fips.FIPS_COUNTIES[fips.FIPS_STATES[default_state]].items(): + items = fips.FIPS_COUNTIES[fips.FIPS_STATES[default_state]].items() + for k, v in items: if code == v: default_county = k break

code = int(CONF.get("band", "repeaterbook")) - for k,v in RB_BANDS.items(): + for k, v in RB_BANDS.items(): if code == v: default_band = k break @@ -823,18 +836,21 @@ If you think that it is valid, you can select a radio model below to force an op

state = miscwidgets.make_choice(sorted(fips.FIPS_STATES.keys()), False, default_state) - county = miscwidgets.make_choice(sorted(fips.FIPS_COUNTIES[fips.FIPS_STATES[default_state]].keys()), - False, default_county) + county = miscwidgets.make_choice( + sorted(fips.FIPS_COUNTIES[fips.FIPS_STATES[default_state]].keys()), + False, default_county) band = miscwidgets.make_choice(sorted(RB_BANDS.keys(), key=key_bands), False, default_band) + def _changed(box, county): state = fips.FIPS_STATES[box.get_active_text()] county.get_model().clear() for fips_county in sorted(fips.FIPS_COUNTIES[state].keys()): county.append_text(fips_county) county.set_active(0) + state.connect("changed", _changed, county) - + d = inputdialog.FieldDialog(title=_("RepeaterBook Query"), parent=self) d.add_field("State", state) d.add_field("County", county) @@ -866,22 +882,24 @@ If you think that it is valid, you can select a radio model below to force an op try: code = CONF.get("state", "repeaterbook") except: - code = '41' # Oregon default + code = '41' # Oregon default

try: county = CONF.get("county", "repeaterbook") except: - county = '%' # --All-- default + county = '%' # --All-- default

try: band = int(CONF.get("band", "repeaterbook")) except: - band = 14 # 2m default + band = 14 # 2m default

- query = "http://www.repeaterbook.com/repeaters/downloads/chirp.php?" + \ - "func=default&state_id=%s&band=%s&freq=%%&band6=%%&loc=%%" + \ + query = "http://www.repeaterbook.com/repeaters/downloads/chirp.php" + \ + "?func=default&state_id=%s&band=%s&freq=%%&band6=%%&loc=%%" + \ "&county_id=%s&status_id=%%&features=%%&coverage=%%&use=%%" - query = query % (code, band and band or "%%", county and county or "%%") + query = query % (code, + band and band or "%%", + county and county or "%%")

# Do this in case the import process is going to take a while # to make sure we process events leading up to this @@ -1009,16 +1027,12 @@ If you think that it is valid, you can select a radio model below to force an op self.do_open_live(radio, read_only=True)

def do_rfinder_prompt(self): - fields = {"1Email" : (gtk.Entry(), - lambda x: "@" in x), - "2Password" : (gtk.Entry(), - lambda x: x), - "3Latitude" : (gtk.Entry(), - lambda x: float(x) < 90 and \ - float(x) > -90), - "4Longitude": (gtk.Entry(), - lambda x: float(x) < 180 and \ - float(x) > -180), + fields = {"1Email": (gtk.Entry(), lambda x: "@" in x), + "2Password": (gtk.Entry(), lambda x: x), + "3Latitude": (gtk.Entry(), + lambda x: float(x) < 90 and float(x) > -90), + "4Longitude": (gtk.Entry(), + lambda x: float(x) < 180 and float(x) > -180), "5Range_in_Miles": (gtk.Entry(), lambda x: int(x) > 0 and int(x) < 5000), } @@ -1070,7 +1084,9 @@ If you think that it is valid, you can select a radio model below to force an op

if do_import: eset = self.get_current_editorset() - count = eset.do_import("rfinder://%s/%s/%f/%f/%i" % (email, passwd, lat, lon, miles)) + rfstr = "rfinder://%s/%s/%f/%f/%i" % \ + (email, passwd, lat, lon, miles) + count = eset.do_import(rfstr) else: from chirp import rfinder radio = rfinder.RFinderRadio(None) @@ -1080,9 +1096,9 @@ If you think that it is valid, you can select a radio model below to force an op self.window.set_cursor(None)

def do_radioreference_prompt(self): - fields = {"1Username" : (gtk.Entry(), lambda x: x), - "2Password" : (gtk.Entry(), lambda x: x), - "3Zipcode" : (gtk.Entry(), lambda x: x), + fields = {"1Username": (gtk.Entry(), lambda x: x), + "2Password": (gtk.Entry(), lambda x: x), + "3Zipcode": (gtk.Entry(), lambda x: x), }

d = inputdialog.FieldDialog(title=_("RadioReference.com Query"), @@ -1131,7 +1147,8 @@ If you think that it is valid, you can select a radio model below to force an op

if do_import: eset = self.get_current_editorset() - count = eset.do_import("radioreference://%s/%s/%s" % (zipcode, username, passwd)) + rrstr = "radioreference://%s/%s/%s" % (zipcode, username, passwd) + count = eset.do_import(rrstr) else: try: from chirp import radioreference @@ -1178,7 +1195,7 @@ If you think that it is valid, you can select a radio model below to force an op d = gtk.AboutDialog() d.set_transient_for(self) import sys - verinfo = "GTK %s\nPyGTK %s\nPython %s\n" % ( \ + verinfo = "GTK %s\nPyGTK %s\nPython %s\n" % ( ".".join([str(x) for x in gtk.gtk_version]), ".".join([str(x) for x in gtk.pygtk_version]), sys.version.split()[0]) @@ -1210,7 +1227,7 @@ If you think that it is valid, you can select a radio model below to force an op os.linesep + "Portuguese (BR): Crezivando PP7CJ") d.set_comments(verinfo) - + d.run() d.destroy()

@@ -1238,12 +1255,13 @@ If you think that it is valid, you can select a radio model below to force an op d.set_size_request(-1, 300) d.set_resizable(False)

- label = gtk.Label(_("Visible columns for {radio}").format(radio=radio_name)) + labelstr = _("Visible columns for {radio}").format(radio=radio_name) + label = gtk.Label(labelstr) label.show() vbox.pack_start(label)

fields = [] - memedit = eset.get_current_editor() #.editors["memedit"] + memedit = eset.get_current_editor() # .editors["memedit"] unsupported = memedit.get_unsupported_columns() for colspec in memedit.cols: if colspec[0].startswith("_"): @@ -1266,7 +1284,7 @@ If you think that it is valid, you can select a radio model below to force an op memedit.set_column_visible(colnum, widget.get_active()) if widget.get_active(): selected_columns.append(widget.get_label()) - + d.destroy()

CONF.set(driver, ",".join(selected_columns), "memedit_columns") @@ -1299,18 +1317,18 @@ If you think that it is valid, you can select a radio model below to force an op

def do_toggle_report(self, action): if not action.get_active(): - d = gtk.MessageDialog(buttons=gtk.BUTTONS_YES_NO, - parent=self) - d.set_markup("<b><big>" + _("Reporting is disabled") + "</big></b>") + d = gtk.MessageDialog(buttons=gtk.BUTTONS_YES_NO, parent=self) + markup = "<b><big>" + _("Reporting is disabled") + "</big></b>" + d.set_markup(markup) msg = _("The reporting feature of CHIRP is designed to help " "<u>improve quality</u> by allowing the authors to focus " "on the radio drivers used most often and errors " "experienced by the users. The reports contain no " - "identifying information and are used only for statistical " - "purposes by the authors. Your privacy is extremely " - "important, but <u>please consider leaving this feature " - "enabled to help make CHIRP better!</u>\n\n<b>Are you " - "sure you want to disable this feature?</b>") + "identifying information and are used only for " + "statistical purposes by the authors. Your privacy is " + "extremely important, but <u>please consider leaving " + "this feature enabled to help make CHIRP better!</u>\n\n" + "<b>Are you sure you want to disable this feature?</b>") d.format_secondary_markup(msg.replace("\n", "\r\n")) r = d.run() d.destroy() @@ -1513,7 +1531,7 @@ If you think that it is valid, you can select a radio model below to force an op </menubar> </ui> """ - actions = [\ + actions = [ ('file', None, _("_File"), None, None, self.mh), ('new', gtk.STOCK_NEW, None, None, None, self.mh), ('open', gtk.STOCK_OPEN, None, None, None, self.mh), @@ -1530,36 +1548,49 @@ If you think that it is valid, you can select a radio model below to force an op ('paste', None, _("_Paste"), "<Ctrl>v", None, self.mh), ('delete', None, _("_Delete"), "Delete", None, self.mh), ('all', None, _("Select _All"), None, None, self.mh), - ('move_up', None, _("Move _Up"), "<Control>Up", None, self.mh), - ('move_dn', None, _("Move Dow_n"), "<Control>Down", None, self.mh), - ('exchange', None, _("E_xchange"), "<Control><Shift>x", None, self.mh), + ('move_up', None, _("Move _Up"), + "<Control>Up", None, self.mh), + ('move_dn', None, _("Move Dow_n"), + "<Control>Down", None, self.mh), + ('exchange', None, _("E_xchange"), + "<Control><Shift>x", None, self.mh), ('properties', None, _("P_roperties"), None, None, self.mh), ('view', None, _("_View"), None, None, self.mh), ('columns', None, _("Columns"), None, None, self.mh), ('viewdeveloper', None, _("Developer"), None, None, self.mh), - ('devshowraw', None, _('Show raw memory'), "<Control><Shift>r", None, self.mh), - ('devdiffraw', None, _("Diff raw memories"), "<Control><Shift>d", None, self.mh), - ('devdifftab', None, _("Diff tabs"), "<Control><Shift>t", None, self.mh), + ('devshowraw', None, _('Show raw memory'), + "<Control><Shift>r", None, self.mh), + ('devdiffraw', None, _("Diff raw memories"), + "<Control><Shift>d", None, self.mh), + ('devdifftab', None, _("Diff tabs"), + "<Control><Shift>t", None, self.mh), ('language', None, _("Change language"), None, None, self.mh), ('radio', None, _("_Radio"), None, None, self.mh), - ('download', None, _("Download From Radio"), "<Alt>d", None, self.mh), + ('download', None, _("Download From Radio"), + "<Alt>d", None, self.mh), ('upload', None, _("Upload To Radio"), "<Alt>u", None, self.mh), ('import', None, _("Import"), "<Alt>i", None, self.mh), ('export', None, _("Export"), "<Alt>x", None, self.mh), - ('importsrc', None, _("Import from data source"), None, None, self.mh), - ('iradioreference', None, _("RadioReference.com"), None, None, self.mh), + ('importsrc', None, _("Import from data source"), + None, None, self.mh), + ('iradioreference', None, _("RadioReference.com"), + None, None, self.mh), ('irfinder', None, _("RFinder"), None, None, self.mh), ('irbook', None, _("RepeaterBook"), None, None, self.mh), ('ipr', None, _("przemienniki.net"), None, None, self.mh), ('querysrc', None, _("Query data source"), None, None, self.mh), - ('qradioreference', None, _("RadioReference.com"), None, None, self.mh), + ('qradioreference', None, _("RadioReference.com"), + None, None, self.mh), ('qrfinder', None, _("RFinder"), None, None, self.mh), ('qpr', None, _("przemienniki.net"), None, None, self.mh), ('qrbook', None, _("RepeaterBook"), None, None, self.mh), - ('export_chirp', None, _("CHIRP Native File"), None, None, self.mh), + ('export_chirp', None, _("CHIRP Native File"), + None, None, self.mh), ('export_csv', None, _("CSV File"), None, None, self.mh), - ('stock', None, _("Import from stock config"), None, None, self.mh), - ('channel_defaults', None, _("Channel defaults"), None, None, self.mh), + ('stock', None, _("Import from stock config"), + None, None, self.mh), + ('channel_defaults', None, _("Channel defaults"), + None, None, self.mh), ('cancelq', gtk.STOCK_STOP, None, "Escape", None, self.mh), ('help', None, _('Help'), None, None, self.mh), ('about', gtk.STOCK_ABOUT, None, None, None, self.mh), @@ -1567,17 +1598,20 @@ If you think that it is valid, you can select a radio model below to force an op ]

conf = config.get() - re = not conf.get_bool("no_report"); + re = not conf.get_bool("no_report") hu = conf.get_bool("hide_unused", "memedit", default=True) dv = conf.get_bool("developer", "state") st = not conf.get_bool("no_smart_tmode", "memedit")

- toggles = [\ - ('report', None, _("Report statistics"), None, None, self.mh, re), - ('hide_unused', None, _("Hide Unused Fields"), None, None, self.mh, hu), - ('no_smart_tmode', None, _("Smart Tone Modes"), None, None, self.mh, st), - ('developer', None, _("Enable Developer Functions"), None, None, self.mh, dv), - ] + toggles = [('report', None, _("Report statistics"), + None, None, self.mh, re), + ('hide_unused', None, _("Hide Unused Fields"), + None, None, self.mh, hu), + ('no_smart_tmode', None, _("Smart Tone Modes"), + None, None, self.mh, st), + ('developer', None, _("Enable Developer Functions"), + None, None, self.mh, dv), + ]

self.menu_uim = gtk.UIManager() self.menu_ag = gtk.ActionGroup("MenuBar") @@ -1599,7 +1633,7 @@ If you think that it is valid, you can select a radio model below to force an op def make_tabs(self): self.tabs = gtk.Notebook()

- return self.tabs + return self.tabs

def close_out(self): num = self.tabs.get_n_pages() @@ -1621,28 +1655,29 @@ If you think that it is valid, you can select a radio model below to force an op self.sb_general = gtk.Statusbar() self.sb_general.set_has_resize_grip(False) self.sb_general.show() - box.pack_start(self.sb_general, 1,1,1) - + box.pack_start(self.sb_general, 1, 1, 1) + self.sb_radio = gtk.Statusbar() self.sb_radio.set_has_resize_grip(True) self.sb_radio.show() - box.pack_start(self.sb_radio, 1,1,1) + box.pack_start(self.sb_radio, 1, 1, 1)

box.show() return box

def ev_delete(self, window, event): if not self.close_out(): - return True # Don't exit + return True # Don't exit

def ev_destroy(self, window): if not self.close_out(): - return True # Don't exit + return True # Don't exit

def setup_extra_hotkeys(self): accelg = self.menu_uim.get_accel_group()

- memedit = lambda a: self.get_current_editorset().editors["memedit"].hotkey(a) + def memedit(a): + self.get_current_editorset().editors["memedit"].hotkey(a)

actions = [ # ("action_name", "key", function) @@ -1654,7 +1689,7 @@ If you think that it is valid, you can select a radio model below to force an op self.menu_ag.add_action_with_accel(a, key) a.set_accel_group(accelg) a.connect_accelerator() - + def _set_icon(self): execpath = platform.get_platform().executable_path() path = os.path.abspath(os.path.join(execpath, "share", "chirp.png")) @@ -1679,7 +1714,7 @@ If you think that it is valid, you can select a radio model below to force an op intv = 3600 * 24 * 7

if CONF.is_defined("last_update_check", "state") and \ - (time.time() - CONF.get_int("last_update_check", "state")) < intv: + (time.time() - CONF.get_int("last_update_check", "state")) < intv: return

CONF.set_int("last_update_check", int(time.time()), "state") @@ -1700,7 +1735,7 @@ If you think that it is valid, you can select a radio model below to force an op except ImportError, e: print "No MacOS support: %s" % e return - + menu_bar.hide() macapp.set_menu_bar(menu_bar)

@@ -1712,7 +1747,7 @@ If you think that it is valid, you can select a radio model below to force an op

documentationitem = self.menu_uim.get_widget("/MenuBar/help/gethelp") macapp.insert_app_menu_item(documentationitem, 0) - + macapp.set_use_quartz_accelerators(False) macapp.ready()

@@ -1746,7 +1781,7 @@ If you think that it is valid, you can select a radio model below to force an op mbar = self.make_menubar()

if os.name != "nt": - self._set_icon() # Windows gets the icon from the exe + self._set_icon() # Windows gets the icon from the exe if os.uname()[0] == "Darwin": self._init_macos(mbar)

@@ -1787,7 +1822,7 @@ If you think that it is valid, you can select a radio model below to force an op d.set_markup("<b><big>" + _("Error reporting is enabled") + "</big></b>") - d.format_secondary_markup(\ + d.format_secondary_markup( _("If you wish to disable this feature you may do so in " "the <u>Help</u> menu")) d.run() diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index b0396cd..e1d57a9 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -71,7 +71,6 @@ ./chirp/wouxun_common.py ./chirp/yaesu_clone.py ./chirpui/fips.py -./chirpui/mainapp.py ./chirpui/memdetail.py ./chirpui/memedit.py ./chirpui/miscwidgets.py

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

Fix style issues in memedit.py (#2355)

diff --git a/chirpui/memedit.py b/chirpui/memedit.py index 5927114..89f4d4b 100644 --- a/chirpui/memedit.py +++ b/chirpui/memedit.py @@ -14,10 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

-if __name__ == "__main__": - import sys - sys.path.insert(0, "..") - import threading

import gtk @@ -36,8 +32,15 @@ from chirpui import common, shiftdialog, miscwidgets, config, memdetail from chirpui import bandplans from chirp import chirp_common, errors, directory, import_logic

+ +if __name__ == "__main__": + import sys + sys.path.insert(0, "..") + + def handle_toggle(_, path, store, col): - store[path][col] = not store[path][col] + store[path][col] = not store[path][col] +

def handle_ed(_, iter, new, store, col): old, = store.get(iter, col) @@ -47,75 +50,78 @@ def handle_ed(_, iter, new, store, col): else: return False

+ class ValueErrorDialog(gtk.MessageDialog): def __init__(self, exception, **args): gtk.MessageDialog.__init__(self, buttons=gtk.BUTTONS_OK, **args) self.set_property("text", _("Invalid value for this field")) self.format_secondary_text(str(exception))

+ def iter_prev(store, iter): row = store.get_path(iter)[0] if row == 0: return None return store.get_iter((row - 1,))

+ class MemoryEditor(common.Editor): cols = [ - (_("Loc") , TYPE_INT, gtk.CellRendererText, ), - (_("Frequency") , TYPE_INT64, gtk.CellRendererText, ), - (_("Name") , TYPE_STRING, gtk.CellRendererText, ), - (_("Tone Mode") , TYPE_STRING, gtk.CellRendererCombo, ), - (_("Tone") , TYPE_FLOAT, gtk.CellRendererCombo, ), - (_("ToneSql") , TYPE_FLOAT, gtk.CellRendererCombo, ), - (_("DTCS Code") , TYPE_INT, gtk.CellRendererCombo, ), - (_("DTCS Rx Code") , TYPE_INT, gtk.CellRendererCombo, ), - (_("DTCS Pol") , TYPE_STRING, gtk.CellRendererCombo, ), - (_("Cross Mode") , TYPE_STRING, gtk.CellRendererCombo, ), - (_("Duplex") , TYPE_STRING, gtk.CellRendererCombo, ), - (_("Offset") , TYPE_INT64, gtk.CellRendererText, ), - (_("Mode") , TYPE_STRING, gtk.CellRendererCombo, ), - (_("Power") , TYPE_STRING, gtk.CellRendererCombo, ), - (_("Tune Step") , TYPE_FLOAT, gtk.CellRendererCombo, ), - (_("Skip") , TYPE_STRING, gtk.CellRendererCombo, ), - (_("Comment") , TYPE_STRING, gtk.CellRendererText, ), - ("_filled" , TYPE_BOOLEAN, None, ), - ("_hide_cols" , TYPE_PYOBJECT,None, ), - ("_extd" , TYPE_STRING, None, ), + (_("Loc"), TYPE_INT, gtk.CellRendererText,), + (_("Frequency"), TYPE_INT64, gtk.CellRendererText,), + (_("Name"), TYPE_STRING, gtk.CellRendererText,), + (_("Tone Mode"), TYPE_STRING, gtk.CellRendererCombo,), + (_("Tone"), TYPE_FLOAT, gtk.CellRendererCombo,), + (_("ToneSql"), TYPE_FLOAT, gtk.CellRendererCombo,), + (_("DTCS Code"), TYPE_INT, gtk.CellRendererCombo,), + (_("DTCS Rx Code"), TYPE_INT, gtk.CellRendererCombo,), + (_("DTCS Pol"), TYPE_STRING, gtk.CellRendererCombo,), + (_("Cross Mode"), TYPE_STRING, gtk.CellRendererCombo,), + (_("Duplex"), TYPE_STRING, gtk.CellRendererCombo,), + (_("Offset"), TYPE_INT64, gtk.CellRendererText,), + (_("Mode"), TYPE_STRING, gtk.CellRendererCombo,), + (_("Power"), TYPE_STRING, gtk.CellRendererCombo,), + (_("Tune Step"), TYPE_FLOAT, gtk.CellRendererCombo,), + (_("Skip"), TYPE_STRING, gtk.CellRendererCombo,), + (_("Comment"), TYPE_STRING, gtk.CellRendererText,), + ("_filled", TYPE_BOOLEAN, None,), + ("_hide_cols", TYPE_PYOBJECT, None,), + ("_extd", TYPE_STRING, None,), ]

defaults = { - _("Name") : "", - _("Frequency") : 146010000, - _("Tone") : 88.5, - _("ToneSql") : 88.5, - _("DTCS Code") : 23, - _("DTCS Rx Code") : 23, - _("DTCS Pol") : "NN", - _("Cross Mode") : "Tone->Tone", - _("Duplex") : "", - _("Offset") : 0, - _("Mode") : "FM", - _("Power") : "", - _("Tune Step") : 5.0, - _("Tone Mode") : "", - _("Skip") : "", - _("Comment") : "", + _("Name"): "", + _("Frequency"): 146010000, + _("Tone"): 88.5, + _("ToneSql"): 88.5, + _("DTCS Code"): 23, + _("DTCS Rx Code"): 23, + _("DTCS Pol"): "NN", + _("Cross Mode"): "Tone->Tone", + _("Duplex"): "", + _("Offset"): 0, + _("Mode"): "FM", + _("Power"): "", + _("Tune Step"): 5.0, + _("Tone Mode"): "", + _("Skip"): "", + _("Comment"): "", }

choices = { - _("Tone") : chirp_common.TONES, - _("ToneSql") : chirp_common.TONES, - _("DTCS Code") : chirp_common.ALL_DTCS_CODES, - _("DTCS Rx Code") : chirp_common.ALL_DTCS_CODES, - _("DTCS Pol") : ["NN", "NR", "RN", "RR"], - _("Mode") : chirp_common.MODES, - _("Power") : [], - _("Duplex") : ["", "-", "+", "split", "off"], - _("Tune Step") : chirp_common.TUNING_STEPS, - _("Tone Mode") : ["", "Tone", "TSQL", "DTCS"], - _("Cross Mode") : chirp_common.CROSS_MODES, + _("Tone"): chirp_common.TONES, + _("ToneSql"): chirp_common.TONES, + _("DTCS Code"): chirp_common.ALL_DTCS_CODES, + _("DTCS Rx Code"): chirp_common.ALL_DTCS_CODES, + _("DTCS Pol"): ["NN", "NR", "RN", "RR"], + _("Mode"): chirp_common.MODES, + _("Power"): [], + _("Duplex"): ["", "-", "+", "split", "off"], + _("Tune Step"): chirp_common.TUNING_STEPS, + _("Tone Mode"): ["", "Tone", "TSQL", "DTCS"], + _("Cross Mode"): chirp_common.CROSS_MODES, } - + def ed_name(self, _, __, new, ___): return self.rthread.radio.filter_name(new)

@@ -136,7 +142,7 @@ class MemoryEditor(common.Editor): dup = "-" offset *= -1

- if not dup in self.choices[_("Duplex")]: + if dup not in self.choices[_("Duplex")]: print "Duplex %s not supported by this radio" % dup return

@@ -203,7 +209,7 @@ class MemoryEditor(common.Editor):

def ed_duplex(self, _foo1, path, new, _foo2): if new == "": - return # Fast path outta here + return # Fast path outta here

iter = self.store.get_iter(path) freq, = self.store.get(iter, self.col(_("Frequency"))) @@ -234,6 +240,7 @@ class MemoryEditor(common.Editor): if modes[0] not in tmodes: modes[0] = tmodes[0] self.store.set(iter, self.col(_("Tone Mode")), modes[0]) + def _cm(*cmodes): if modes[0] == "Cross" and modes[1] not in cmodes: modes[1] = cmodes[0] @@ -314,7 +321,6 @@ class MemoryEditor(common.Editor): if duplex == "" or duplex == "(None)" or duplex == "off": hide += [self.col(_("Offset"))]

- return hide

def maybe_hide_cols(self, iter): @@ -327,19 +333,19 @@ class MemoryEditor(common.Editor): return

iter = self.store.get_iter(path) - if not self.store.get(iter, self.col("_filled"))[0] \ - and self.store.get(iter, self.col(_("Frequency")))[0] == 0: + if not self.store.get(iter, self.col("_filled"))[0] and \ + self.store.get(iter, self.col(_("Frequency")))[0] == 0: print _("Editing new item, taking defaults") self.insert_new(iter)

colnum = self.col(cap) funcs = { - _("Loc") : self.ed_loc, - _("Name") : self.ed_name, - _("Frequency") : self.ed_freq, - _("Duplex") : self.ed_duplex, - _("Offset") : self.ed_offset, - _("Tone") : self.ed_tone_field, + _("Loc"): self.ed_loc, + _("Name"): self.ed_name, + _("Frequency"): self.ed_freq, + _("Duplex"): self.ed_duplex, + _("Offset"): self.ed_offset, + _("Tone"): self.ed_tone_field, _("ToneSql"): self.ed_tone_field, _("DTCS Code"): self.ed_tone_field, _("DTCS Rx Code"): self.ed_tone_field, @@ -347,7 +353,7 @@ class MemoryEditor(common.Editor): _("Cross Mode"): self.ed_tone_field, }

- if funcs.has_key(cap): + if cap in func: new = funcs[cap](rend, path, new, colnum)

if new is None: @@ -375,8 +381,8 @@ class MemoryEditor(common.Editor):

msgs = self.rthread.radio.validate_memory(mem) if msgs: - common.show_error(_("Error setting memory") + ": " + \ - "\r\n\r\n".join(msgs)) + common.show_error(_("Error setting memory") + ": " + + "\r\n\r\n".join(msgs)) self.prefill() return

@@ -414,7 +420,6 @@ class MemoryEditor(common.Editor): if extd: val = extd

- return val

def render(self, _, rend, model, iter, colnum): @@ -427,14 +432,14 @@ class MemoryEditor(common.Editor): for key, val in self.defaults.items(): line.append(self.col(key)) line.append(val) - + if not loc: loc, = self.store.get(iter, self.col(_("Loc")))

self.store.set(iter, 0, loc, *tuple(line)) - + return self._get_memory(iter)

def insert_easy(self, store, _iter, delta): @@ -454,12 +459,12 @@ class MemoryEditor(common.Editor): self.rthread.submit(job)

def insert_hard(self, store, _iter, delta, warn=True): - if isinstance(self.rthread.radio, chirp_common.LiveRadio) and warn: + if isinstance(self.rthread.radio, chirp_common.LiveRadio) and warn: txt = _("This operation requires moving all subsequent channels " "by one spot until an empty location is reached. This " "can take a LONG time. Are you sure you want to do this?") if not common.ask_yesno_question(txt): - return False # No change + return False # No change

if delta <= 0: iter = _iter @@ -477,11 +482,12 @@ class MemoryEditor(common.Editor): else: sd.insert(pos) sd.destroy() - job = common.RadioJob(lambda x: self.prefill(), "erase_memory", pos) + job = common.RadioJob( + lambda x: self.prefill(), "erase_memory", pos) job.set_desc(_("Adding memory {number}").format(number=pos)) self.rthread.submit(job)

- return True # We changed memories + return True # We changed memories

def _delete_rows(self, paths): to_remove = [] @@ -493,16 +499,15 @@ class MemoryEditor(common.Editor): job = common.RadioJob(None, "erase_memory", cur_pos) job.set_desc(_("Erasing memory {number}").format(number=cur_pos)) self.rthread.submit(job) - + def handler(mem): if not isinstance(mem, Exception): if not mem.empty or self.show_empty: gobject.idle_add(self.set_memory, mem) - + job = common.RadioJob(handler, "get_memory", cur_pos) job.set_desc(_("Getting memory {number}").format(number=cur_pos)) self.rthread.submit(job) -

if not self.show_empty: # We need to actually remove the rows from the store @@ -518,11 +523,11 @@ class MemoryEditor(common.Editor): if pos in to_remove: to_remove.remove(pos) if not self.store.remove(iter): - break # This was the last row + break # This was the last row else: iter = self.store.iter_next(iter)

- return True # We changed memories + return True # We changed memories

def _delete_rows_and_shift(self, paths, all=False): iter = self.store.get_iter(paths[0]) @@ -533,7 +538,7 @@ class MemoryEditor(common.Editor): sd.destroy()

self.prefill() - return True # We changed memories + return True # We changed memories

def _move_up_down(self, paths, action): if action.endswith("up"): @@ -550,12 +555,12 @@ class MemoryEditor(common.Editor): if victim_path[0] < 0: raise ValueError() donor_loc = self.store.get(self.store.get_iter(donor_path), - self.col(_("Loc")))[0] + self.col(_("Loc")))[0] victim_loc = self.store.get(self.store.get_iter(victim_path), - self.col(_("Loc")))[0] + self.col(_("Loc")))[0] except ValueError: self.emit("usermsg", "No room to %s" % (action.replace("_", " "))) - return False # No change + return False # No change

class Context: pass @@ -587,7 +592,7 @@ class MemoryEditor(common.Editor): old = mem.number mem.number = dest job = common.RadioJob(None, "set_memory", mem) - job.set_desc(\ + job.set_desc( _("Moving memory from {old} to {new}").format(old=old, new=dest)) self.rthread.submit(job) @@ -598,7 +603,7 @@ class MemoryEditor(common.Editor): old = mem.number mem.number += delta job = common.RadioJob(None, "set_memory", mem) - job.set_desc(\ + job.set_desc( _("Moving memory from {old} to {new}").format(old=old, new=old+delta)) self.rthread.submit(job) @@ -631,7 +636,7 @@ class MemoryEditor(common.Editor): job.set_desc("Getting memory %i" % loc) self.rthread.submit(job)

- return True # We (scheduled some) change to the memories + return True # We (scheduled some) change to the memories

def _exchange_memories(self, paths): if len(paths) != 2: @@ -647,8 +652,9 @@ class MemoryEditor(common.Editor): src = mem.number mem.number = dst job = common.RadioJob(None, "set_memory", mem) - job.set_desc(_("Moving memory from {old} to {new}").format(old=src, - new=dst)) + job.set_desc( + _("Moving memory from {old} to {new}").format( + old=src, new=dst)) self.rthread.submit(job) if dst == loc_a: self.prefill() @@ -669,8 +675,8 @@ class MemoryEditor(common.Editor): def _show_raw(self, cur_pos): def idle_show_raw(result): gobject.idle_add(common.show_diff_blob, - _("Raw memory {number}").format(number=cur_pos), - result) + _("Raw memory {number}").format( + number=cur_pos), result)

job = common.RadioJob(idle_show_raw, "get_raw_memory", cur_pos) job.set_desc(_("Getting raw memory {number}").format(number=cur_pos)) @@ -722,8 +728,8 @@ class MemoryEditor(common.Editor): def apply_and_set(memory): for field in fields: self._copy_field(src_memory, memory, field) - cb = (memory.number == locations[-1] - and self._set_memory_cb or None) + cb = (memory.number == locations[-1] and + self._set_memory_cb or None) job = common.RadioJob(cb, "set_memory", memory) job.set_desc(_("Writing memory {number}").format( number=memory.number)) @@ -745,7 +751,7 @@ class MemoryEditor(common.Editor): if len(locations) > 1: self._apply_multiple(memory, dlg.get_fields(), locations) else: - if not "name" in mem.immutable: + if "name" not in mem.immutable: mem.name = self.rthread.radio.filter_name(mem.name) job = common.RadioJob(self._set_memory_cb, "set_memory", mem) job.set_desc(_("Writing memory {number}").format( @@ -788,7 +794,7 @@ class MemoryEditor(common.Editor): elif action == "exchange": changed = self._exchange_memories(paths) elif action in ["cut", "copy"]: - changed = self.copy_selection(action=="cut") + changed = self.copy_selection(action == "cut") elif action == "paste": changed = self.paste_selection() elif action == "all": @@ -829,7 +835,7 @@ class MemoryEditor(common.Editor):

menu_xml = """ <ui> - <popup name="Menu"> + <popup name="Menu"> <menuitem action="cut"/> <menuitem action="copy"/> <menuitem action="paste"/> @@ -853,7 +859,6 @@ class MemoryEditor(common.Editor): </ui> """ % devmenu

- (store, paths) = self.view.get_selection().get_selected_rows() issingle = len(paths) == 1 istwo = len(paths) == 2 @@ -916,7 +921,7 @@ class MemoryEditor(common.Editor): menu = self.make_context_menu() menu.popup(None, None, None, event.button, event.time) return True - + def get_column_visible(self, col): column = self.view.get_column(col) return column.get_visible() @@ -924,7 +929,7 @@ class MemoryEditor(common.Editor): def set_column_visible(self, col, visible): column = self.view.get_column(col) column.set_visible(visible) - + def cell_editing_started(self, rend, event, path): self._in_editing = True

@@ -947,10 +952,10 @@ class MemoryEditor(common.Editor):

filled = self.col("_filled")

- default_col_order = [x for x,y,z in self.cols if z] + default_col_order = [x for x, y, z in self.cols if z] try: - col_order = self._config.get("column_order_%s" % \ - self.__class__.__name__).split(",") + col_order = self._config.get("column_order_%s" % + self.__class__.__name__).split(",") if len(col_order) != len(default_col_order): raise Exception() for i in col_order: @@ -976,9 +981,10 @@ class MemoryEditor(common.Editor): rend.connect('edited', self.cell_editing_stopped)

if _type == TYPE_BOOLEAN: - #rend.set_property("activatable", True) - #rend.connect("toggled", handle_toggle, self.store, i) - col = gtk.TreeViewColumn(_cap, rend, active=i, sensitive=filled) + # rend.set_property("activatable", True) + # rend.connect("toggled", handle_toggle, self.store, i) + col = gtk.TreeViewColumn(_cap, rend, active=i, + sensitive=filled) elif _rend == gtk.CellRendererCombo: if isinstance(self.choices[_cap], gtk.ListStore): choices = self.choices[_cap] @@ -998,14 +1004,14 @@ class MemoryEditor(common.Editor): rend.connect("edited", self.edited, _cap) col = gtk.TreeViewColumn(_cap, rend, text=i, sensitive=filled) col.set_cell_data_func(rend, self.render, i) - + col.set_reorderable(True) col.set_sort_column_id(i) col.set_resizable(True) col.set_min_width(1) col.set_visible(not _cap.startswith("_") and _cap in visible_cols and - not _cap in unsupported_cols) + _cap not in unsupported_cols) cols[_cap] = col i += 1

@@ -1028,7 +1034,9 @@ class MemoryEditor(common.Editor): try: return self._cached_cols[caption] except KeyError: - raise Exception(_("Internal Error: Column {name} not found").format(name=caption)) + raise Exception( + _("Internal Error: Column {name} not found").format( + name=caption))

def prefill(self): self.store.clear() @@ -1109,13 +1117,14 @@ class MemoryEditor(common.Editor): # FIXME: Make the actual remove happen on callback self.store.remove(iter) job = common.RadioJob(None, "erase_memory", number) - job.set_desc(_("Erasing memory {number}").format(number=number)) + job.set_desc( + _("Erasing memory {number}").format(number=number)) self.rthread.submit() break iter = self.store.iter_next(iter)

def _set_mem_vals(self, mem, vals, iter): - power_levels = {"" : None} + power_levels = {"": None} for i in self._features.valid_power_levels: power_levels[str(i)] = i

@@ -1149,9 +1158,10 @@ class MemoryEditor(common.Editor):

def _limit_key(self, which): if which not in ["lo", "hi"]: - raise Exception(_("Internal Error: Invalid limit {number}").format(number=which)) - return "%s_%s" % (directory.radio_class_id(self.rthread.radio.__class__), - which) + raise Exception(_("Internal Error: Invalid limit {number}").format( + number=which)) + return "%s_%s" % \ + (directory.radio_class_id(self.rthread.radio.__class__), which)

def _store_limit(self, sb, which): self._config.set_int(self._limit_key(which), int(sb.get_value())) @@ -1200,7 +1210,7 @@ class MemoryEditor(common.Editor): hival = self.hi_limit_adj.get_value() if loval >= hival: self.hi_limit_adj.set_value(loval + 25) - + lo.connect_after("focus-out-event", set_hi) lo.connect_after("activate", activate_go) hi.connect_after("activate", activate_go) @@ -1219,7 +1229,7 @@ class MemoryEditor(common.Editor):

showempty = gtk.ToggleButton(_("Show Empty")) showempty.set_relief(gtk.RELIEF_NONE) - showempty.set_active(self.show_empty); + showempty.set_active(self.show_empty) showempty.connect("toggled", lambda x: self.set_show_empty(x.get_active())) showempty.show() @@ -1231,7 +1241,9 @@ class MemoryEditor(common.Editor):

props = gtk.Button(_("Properties")) props.set_relief(gtk.RELIEF_NONE) - props.connect("clicked", lambda x: self.hotkey(gtk.Action("properties", "", "", 0))) + props.connect("clicked", + lambda x: self.hotkey( + gtk.Action("properties", "", "", 0))) props.show() hbox.pack_start(props, 0, 0, 0)

@@ -1359,7 +1371,7 @@ class MemoryEditor(common.Editor): vbox.show()

self.prefill() - + self.root = vbox

# Run low priority jobs to get the rest of the memories @@ -1393,13 +1405,14 @@ class MemoryEditor(common.Editor): mem = self._get_memory(iter) selection.append(mem.dupe()) maybe_cut.append((iter, mem)) - + if cut: for iter, mem in maybe_cut: mem.empty = True job = common.RadioJob(self._set_memory_cb, "erase_memory", mem.number) - job.set_desc(_("Cutting memory {number}").format(number=mem.number)) + job.set_desc( + _("Cutting memory {number}").format(number=mem.number)) self.rthread.submit(job)

self._set_memory(iter, mem) @@ -1408,7 +1421,7 @@ class MemoryEditor(common.Editor): clipboard = gtk.Clipboard(selection="PRIMARY") clipboard.set_text(result)

- return cut # Only changed if we did a cut + return cut # Only changed if we did a cut

def _paste_selection(self, clipboard, text, data): if not text: @@ -1432,9 +1445,9 @@ class MemoryEditor(common.Editor): if (paths[0][0] + len(mem_list)) > self._rows_in_store: common.show_error(_("Unable to paste {src} memories into " "{dst} rows. Increase the memory bounds " - "or show empty memories.").format(\ - src=len(mem_list), - dst=(self._rows_in_store - paths[0][0]))) + "or show empty memories.").format( + src=len(mem_list), + dst=(self._rows_in_store - paths[0][0]))) return

for mem in mem_list: @@ -1449,7 +1462,8 @@ class MemoryEditor(common.Editor): gtk.STOCK_NO, 2, gtk.STOCK_CANCEL, 3, "All", 4)) - d.set_text(_("Overwrite location {number}?").format(number=loc)) + d.set_text( + _("Overwrite location {number}?").format(number=loc)) r = d.run() d.destroy() if r == 4: @@ -1464,22 +1478,23 @@ class MemoryEditor(common.Editor):

src_number = mem.number mem.number = loc - + try: mem = import_logic.import_mem(self.rthread.radio, src_features, mem) except import_logic.DestNotCompatible: msgs = self.rthread.radio.validate_memory(mem) - errs = [x for x in msgs if isinstance(x, - chirp_common.ValidationError)] + errs = [x for x in msgs + if isinstance(x, chirp_common.ValidationError)] if errs: d = miscwidgets.YesNoDialog(title=_("Incompatible Memory"), buttons=(gtk.STOCK_OK, 1, gtk.STOCK_CANCEL, 2)) - d.set_text(_("Pasted memory {number} is not compatible with " - "this radio because:").format(number=src_number) +\ - os.linesep + os.linesep.join(msgs)) + d.set_text( + _("Pasted memory {number} is not compatible with " + "this radio because:").format(number=src_number) + + os.linesep + os.linesep.join(msgs)) r = d.run() d.destroy() if r == 2: @@ -1492,7 +1507,8 @@ class MemoryEditor(common.Editor): iter = store.iter_next(iter)

job = common.RadioJob(self._set_memory_cb, "set_memory", mem) - job.set_desc(_("Writing memory {number}").format(number=mem.number)) + job.set_desc( + _("Writing memory {number}").format(number=mem.number)) self.rthread.submit(job)

def paste_selection(self): @@ -1510,6 +1526,7 @@ class MemoryEditor(common.Editor): def other_editor_changed(self, target_editor): self.need_refresh = True

+ class DstarMemoryEditor(MemoryEditor): def _get_cols_to_hide(self, iter): hide = MemoryEditor._get_cols_to_hide(self, iter) @@ -1582,12 +1599,12 @@ class DstarMemoryEditor(MemoryEditor): self.defaults["Digital Code"] = 0

MemoryEditor.__init__(self, rthread) - + def ucall_cb(calls): self.defaults["URCALL"] = calls[0] for call in calls: self.choices["URCALL"].append((call, call)) - + if self._features.requires_call_lists: ujob = common.RadioJob(ucall_cb, "get_urcall_list") ujob.set_desc(_("Downloading URCALL list")) @@ -1609,7 +1626,7 @@ class DstarMemoryEditor(MemoryEditor):

if not self._features.requires_call_lists: for i in _dv_columns: - if not self.choices.has_key(i): + if i not in self.choices: continue column = self.view.get_column(self.col(i)) rend = column.get_cell_renderers()[0] @@ -1653,5 +1670,6 @@ class DstarMemoryEditor(MemoryEditor): self.col("Digital Code"), 0, )

+ class ID800MemoryEditor(DstarMemoryEditor): pass diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 03dbba8..3899a67 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -71,7 +71,6 @@ ./chirp/wouxun_common.py ./chirp/yaesu_clone.py ./chirpui/fips.py -./chirpui/memedit.py ./chirpui/miscwidgets.py ./chirpui/reporting.py ./tools/bitdiff.py

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

Fix style issues in reporting.py (#2355)

diff --git a/chirpui/reporting.py b/chirpui/reporting.py index efe18c1..0f524c5 100644 --- a/chirpui/reporting.py +++ b/chirpui/reporting.py @@ -34,7 +34,7 @@ from chirp import CHIRP_VERSION, platform

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

@@ -47,6 +47,7 @@ try: except: ENABLED = False

+ def should_report(): if not ENABLED: LOG.debug("Not reporting due to recent failure") @@ -59,11 +60,13 @@ def should_report():

return True

+ def _report_model_usage(model, direction, success): global ENABLED - if direction not in ["live", "download", "upload", "import", "export", "importsrc"]: + if direction not in ["live", "download", "upload", + "import", "export", "importsrc"]: print "Invalid direction `%s'" % direction - return True # This is a bug, but not fatal + return True # This is a bug, but not fatal

model = "%s_%s" % (model.VENDOR, model.MODEL) data = "%s,%s,%s" % (model, direction, success) @@ -79,6 +82,7 @@ def _report_model_usage(model, direction, success): # If the server returns zero, it wants us to shut up return id != 0

+ def _report_exception(stack): global ENABLED

@@ -93,6 +97,7 @@ def _report_exception(stack): # If the server returns zero, it wants us to shut up return id != 0

+ def _report_misc_error(module, data): global ENABLED

@@ -106,6 +111,7 @@ def _report_misc_error(module, data): # If the server returns zero, it wants us to shut up return id != 0

+ def _check_for_updates(callback): LOG.debug("Checking for updates") proxy = xmlrpclib.ServerProxy(REPORT_URL) @@ -116,6 +122,7 @@ def _check_for_updates(callback): callback(ver) return True

+ class ReportThread(threading.Thread): def __init__(self, func, *args): threading.Thread.__init__(self) @@ -128,7 +135,7 @@ class ReportThread(threading.Thread): except Exception, e: LOG.debug("Failed to report: %s" % e) return False - + def run(self): start = time.time() result = self._run() @@ -137,12 +144,13 @@ class ReportThread(threading.Thread): ENABLED = False elif (time.time() - start) > 15: # Reporting took too long - LOG.debug("Time to report was %.2f sec -- Disabling" % \ + LOG.debug("Time to report was %.2f sec -- Disabling" % (time.time()-start)) ENABLED = False

THREAD_SEM.release()

+ def dispatch_thread(func, *args): global LAST global LAST_TYPE @@ -169,15 +177,19 @@ def dispatch_thread(func, *args): t = ReportThread(func, *args) t.start()

+ def report_model_usage(model, direction, success): dispatch_thread(_report_model_usage, model, direction, success)

+ def report_exception(stack): dispatch_thread(_report_exception, stack)

+ def report_misc_error(module, data): dispatch_thread(_report_misc_error, module, data)

+ # Calls callback with the latest version def check_for_updates(callback): dispatch_thread(_check_for_updates, callback) diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 8421d48..54f568f 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -71,6 +71,5 @@ ./chirp/wouxun_common.py ./chirp/yaesu_clone.py ./chirpui/fips.py -./chirpui/reporting.py ./tools/bitdiff.py ./tools/img2thd72.py

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

Fix style issues in tools (#2355)

diff --git a/tools/bitdiff.py b/tools/bitdiff.py index a13c63b..d06bdb2 100644 --- a/tools/bitdiff.py +++ b/tools/bitdiff.py @@ -1,81 +1,89 @@ #!/usr/bin/env python # -## Copyright 2013 Jens Jensen AF5MI kd4tjx@yahoo.com +# Copyright 2013 Jens Jensen AF5MI kd4tjx@yahoo.com + +import sys +import os +import argparse +import time

-import sys, os, argparse, time

def printDiff(pos, byte1, byte2, args): - - bits1 = '{0:08b}'.format(byte1) - bits2 = '{0:08b}'.format(byte2) - print "@%04Xh" % pos - print "1:%02Xh, %sb" % (byte1, bits1) - print "2:%02Xh, %sb" % (byte2, bits2) - if args.csv: - writeDiffCSV(pos, byte1, byte2, args) + bits1 = '{0:08b}'.format(byte1) + bits2 = '{0:08b}'.format(byte2) + print "@%04Xh" % pos + print "1:%02Xh, %sb" % (byte1, bits1) + print "2:%02Xh, %sb" % (byte2, bits2) + if args.csv: + writeDiffCSV(pos, byte1, byte2, args) +

def writeDiffCSV(pos, byte1, byte2, args): bits1 = '{0:08b}'.format(byte1) bits2 = '{0:08b}'.format(byte2) csvline = '%s, %s, %04X, %02X, %s, %02X, %s, %s, %s' % \ - (args.file1, args.file2, pos, byte1, bits1, byte2, bits2, args.setting, args.value) + (args.file1, args.file2, pos, byte1, bits1, + byte2, bits2, args.setting, args.value) if not os.path.isfile(args.csv): fh = open(args.csv, "w") - header = "filename1, filename2, byte_offset, byte1, bits1, byte2, bits2, item_msg, value_msg" + header = "filename1, filename2, byte_offset, byte1, " \ + "bits1, byte2, bits2, item_msg, value_msg" fh.write(header + os.linesep) else: fh = open(args.csv, "a") fh.write(csvline + os.linesep) fh.close() - +

def compareFiles(args): - f1 = open(args.file1, "rb") - f1.seek(args.offset) - f2 = open(args.file2, "rb") - f2.seek(args.offset) - - while True: - pos = f1.tell() - args.offset - c1 = f1.read(1) - c2 = f2.read(1) - if not (c1 and c2): - break - b1 = ord(c1) - b2 = ord(c2) - if b1 != b2: - printDiff(pos, b1, b2, args) - - pos = f1.tell() - args.offset - print "bytes read: %02d" % pos - f1.close() - f2.close() + f1 = open(args.file1, "rb") + f1.seek(args.offset) + f2 = open(args.file2, "rb") + f2.seek(args.offset) + + while True: + pos = f1.tell() - args.offset + c1 = f1.read(1) + c2 = f2.read(1) + if not (c1 and c2): + break + b1 = ord(c1) + b2 = ord(c2) + if b1 != b2: + printDiff(pos, b1, b2, args) + + pos = f1.tell() - args.offset + print "bytes read: %02d" % pos + f1.close() + f2.close() +

def compareFilesDat(args): - f1 = open(args.file1, "r") - f1contents = f1.read() - f1.close() - f2 = open(args.file2, "r") - f2contents = f2.read() - f2.close() - - f1strlist = f1contents.split() - f1intlist = map(int, f1strlist) - f2strlist = f2contents.split() - f2intlist = map(int, f2strlist) - f1bytes = bytearray(f1intlist) - f2bytes = bytearray(f2intlist) - - length = len(f1intlist) - for i in range(length): - b1 = f1bytes[i] - b2 = f2bytes[i] - pos = i - if b1 != b2: - printDiff(pos, b1, b2, args) - - pos = length - print "bytes read: %02d" % pos + f1 = open(args.file1, "r") + f1contents = f1.read() + f1.close() + f2 = open(args.file2, "r") + f2contents = f2.read() + f2.close() + + f1strlist = f1contents.split() + f1intlist = map(int, f1strlist) + f2strlist = f2contents.split() + f2intlist = map(int, f2strlist) + f1bytes = bytearray(f1intlist) + f2bytes = bytearray(f2intlist) + + length = len(f1intlist) + for i in range(length): + b1 = f1bytes[i] + b2 = f2bytes[i] + pos = i + if b1 != b2: + printDiff(pos, b1, b2, args) + + pos = length + print "bytes read: %02d" % pos +

def convertFileToBin(args): f1 = open(args.file1, "r") @@ -88,34 +96,53 @@ def convertFileToBin(args): f2.write(f1bytes) f2.close

+ def convertFileToDat(args): f1 = open(args.file1, "rb") f1contents = f1.read() f1.close() f2 = open(args.file2, "w") - for i in range(0, len(f1contents)): + for i in range(0, len(f1contents)): f2.write(" %d " % (ord(f1contents[i]), )) if i % 16 == 15: f2.write("\r\n") f2.close

-# -## main + +# main

ap = argparse.ArgumentParser(description="byte-/bit- comparison of two files") ap.add_argument("file1", help="first (reference) file to parse") ap.add_argument("file2", help="second file to parse") + mutexgrp1 = ap.add_mutually_exclusive_group() -mutexgrp1.add_argument("-o", "--offset", help="offset (hex) to start comparison", default=0) -mutexgrp1.add_argument("-d", "--dat", help="process input files from .DAT/.ADJ format (from 'jujumao' oem programming software for chinese radios)", action="store_true") -mutexgrp1.add_argument("--convert2bin", help="convert file1 from .dat/.adj to binary image file2", action="store_true") -mutexgrp1.add_argument("--convert2dat", help="convert file1 from bin to .dat/.adj file2", action="store_true") -ap.add_argument("-w", "--watch", help="'watch' changes. runs in a loop", action="store_true") +mutexgrp1.add_argument("-o", "--offset", default=0, + help="offset (hex) to start comparison") +mutexgrp1.add_argument("-d", "--dat", action="store_true", + help="process input files from .DAT/.ADJ format " + "(from 'jujumao' oem programming software " + "for chinese radios)") +mutexgrp1.add_argument("--convert2bin", action="store_true", + help="convert file1 from .dat/.adj to " + "binary image file2") +mutexgrp1.add_argument("--convert2dat", action="store_true", + help="convert file1 from bin to .dat/.adj file2") + +ap.add_argument("-w", "--watch", action="store_true", + help="'watch' changes. runs in a loop") + csvgrp = ap.add_argument_group("csv output") -csvgrp.add_argument("-c", "--csv", help="file to append csv results. format: \ - filename1, filename2, byte_offset, byte1, bits1, byte2, bits2, item_msg, value_msg") -csvgrp.add_argument("-s", "--setting", help="user-meaningful field indicating setting/item modified, e.g. 'beep' or 'txtone'") -csvgrp.add_argument("-v", "--value", help="user-meaningful field indicating values changed, e.g. 'true->false' or '110.9->100.0'") +csvgrp.add_argument("-c", "--csv", + help="file to append csv results. format: filename1, " + "filename2, byte_offset, byte1, bits1, byte2, " + "bits2, item_msg, value_msg") +csvgrp.add_argument("-s", "--setting", + help="user-meaningful field indicating setting/item " + "modified, e.g. 'beep' or 'txtone'") +csvgrp.add_argument("-v", "--value", + help="user-meaningful field indicating values " + "changed, e.g. 'true->false' or '110.9->100.0'") + args = ap.parse_args() if args.offset: args.offset = int(args.offset, 16) @@ -130,10 +157,10 @@ while True: elif (args.convert2bin): convertFileToBin(args) elif (args.convert2dat): - convertFileToDat(args) + convertFileToDat(args) else: - compareFiles(args) + compareFiles(args) if not args.watch: - break + break print "------" time.sleep(delay) diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist index 2824a96..5d7ad07 100644 --- a/tools/cpep8.blacklist +++ b/tools/cpep8.blacklist @@ -70,5 +70,3 @@ ./chirp/wouxun.py ./chirp/wouxun_common.py ./chirp/yaesu_clone.py -./tools/bitdiff.py -./tools/img2thd72.py diff --git a/tools/img2thd72.py b/tools/img2thd72.py index a68a15c..407bdf7 100644 --- a/tools/img2thd72.py +++ b/tools/img2thd72.py @@ -18,43 +18,46 @@ # along with this software. If not, see http://www.gnu.org/licenses/.

-import sys, getopt +import sys +import getopt from PIL import Image as im

+ def die(msg): print msg sys.exit(1)

+ def thd72bitmap(fname, invert): img = im.open(ifname) - if img.size != (120,48): + if img.size != (120, 48): die("Image has wrong dimensions: must be 120x48") - + colors = img.getcolors() if len(colors) != 2: die("Image must be 1 bits per pixel (black and white)") - - if ('-i','') in opts: - c,black = colors[0] - c,white = colors[1] - else: - c,white = colors[0] - c,black = colors[1]

+ if ('-i', '') in opts: + c, black = colors[0] + c, white = colors[1] + else: + c, white = colors[0] + c, black = colors[1]

- colors = { black: 1, white: 0 } + colors = {black: 1, white: 0} data = img.getdata() buf = '' for y in range(6): for x in range(120): b = 0 for i in range(8): - b |= colors[data[x + 120*(y*8+i)]] << i + b |= colors[data[x + 120 * (y * 8 + i)]] << i buf += chr(b) return buf

+ def display_thd72(buf): - dots = { 0: '*', 1: ' '} + dots = {0: '*', 1: ' '} lines = [] for y in range(48): line = '' @@ -65,8 +68,10 @@ def display_thd72(buf): for l in lines: print l

+ def usage(): - print "\nUsage: %s <-s|-g> [-i] [-d] <image-file> <thd72-nvram-file>" % sys.argv[0] + print "\nUsage: %s <-s|-g> [-i] [-d] " \ + "<image-file> <thd72-nvram-file>" % sys.argv[0] print "\nThis program will modify whatever nvram file provided or will" print "create a new one if the file does not exist. After using this to" print "modify the image, you can use that file to upload all or part of" @@ -112,7 +117,7 @@ if __name__ == "__main__": of.seek(65536) of.close()

- if ('-d','') in opts: + if ('-d', '') in opts: display_thd72(buf)

blocks = [0, ] @@ -120,4 +125,3 @@ if __name__ == "__main__": blocks.append(1+imgpos/256) blocks.append(2+imgpos/256) print "Modified block list:", blocks -