[chirp_devel] [PATCH 3/3] Update cpep8 to use pep8 1.6.2 (#2355)
Zach Welch
Sat Feb 28 03:03:35 PST 2015
# HG changeset patch
# User Zach Welch <zach at mandolincreekfarm.com>
# Fake Node ID 0382c2201867cc52a6178e85202fc112acb45d69
Update cpep8 to use pep8 1.6.2 (#2355)
This patch updates the virtualenv version of pep8 to 1.6.2, chasing
down the new style errors that pop up in the already cleaned files.
diff --git a/chirp/generic_xml.py b/chirp/generic_xml.py
index b8aec0a..8f96278 100644
--- a/chirp/generic_xml.py
+++ b/chirp/generic_xml.py
@@ -89,7 +89,7 @@ class XMLRadio(chirp_common.FileBackedRadio, chirp_common.IcomDstarSupport):
def get_features(self):
rf = chirp_common.RadioFeatures()
rf.has_bank = False
- #rf.has_bank_index = True
+ # rf.has_bank_index = True
rf.requires_call_lists = False
rf.has_implicit_calls = False
rf.memory_bounds = (0, 1000)
diff --git a/chirp/platform.py b/chirp/platform.py
index 5429ebc..d09240b 100644
--- a/chirp/platform.py
+++ b/chirp/platform.py
@@ -57,8 +57,12 @@ def _find_me():
def natural_sorted(l):
- convert = lambda text: int(text) if text.isdigit() else text.lower()
- natural_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)]
+ def convert(text):
+ int(text) if text.isdigit() else text.lower()
+
+ def natural_key(key):
+ [convert(c) for c in re.split('([0-9]+)', key)]
+
return sorted(l, key=natural_key)
@@ -451,10 +455,10 @@ def _do_test():
print "Log file (foo): %s" % __pform.log_file("foo")
print "Serial ports: %s" % __pform.list_serial_ports()
print "OS Version: %s" % __pform.os_version_string()
- #__pform.open_text_file("d-rats.py")
+ # __pform.open_text_file("d-rats.py")
- #print "Open file: %s" % __pform.gui_open_file()
- #print "Save file: %s" % __pform.gui_save_file(default_name="Foo.txt")
+ # print "Open file: %s" % __pform.gui_open_file()
+ # print "Save file: %s" % __pform.gui_save_file(default_name="Foo.txt")
print "Open folder: %s" % __pform.gui_select_dir("/tmp")
if __name__ == "__main__":
diff --git a/chirp/template.py b/chirp/template.py
index 1477629..381b103 100644
--- a/chirp/template.py
+++ b/chirp/template.py
@@ -109,8 +109,8 @@ class TemplateRadio(chirp_common.CloneModeRadio):
mem = chirp_common.Memory()
mem.number = number # Set the memory number
- mem.freq = int(_mem.freq) # Convert your low-level frequency
- # to Hertz
+ # Convert your low-level frequency to Hertz
+ mem.freq = int(_mem.freq)
mem.name = str(_mem.name).rstrip() # Set the alpha tag
# We'll consider any blank (i.e. 0MHz frequency) to be empty
@@ -125,6 +125,6 @@ class TemplateRadio(chirp_common.CloneModeRadio):
# Get a low-level memory object mapped to the image
_mem = self._memobj.memory[mem.number]
- _mem.freq = mem.freq # Convert to low-level frequency
- # representation
+ # Convert to low-level frequency representation
+ _mem.freq = mem.freq
_mem.name = mem.name.ljust(8)[:8] # Store the alpha tag
diff --git a/chirp/xml_ll.py b/chirp/xml_ll.py
index 8713507..e3bac20 100644
--- a/chirp/xml_ll.py
+++ b/chirp/xml_ll.py
@@ -88,13 +88,13 @@ def get_memory(doc, number):
else:
mem.skip = skip
- #FIXME: bank support in .chirp files needs to be re-written
- #bank_id = _get("/bank/@bankId")
- #if bank_id:
- # mem.bank = int(bank_id)
- # bank_index = _get("/bank/@bankIndex")
- # if bank_index:
- # mem.bank_index = int(bank_index)
+ # FIXME: bank support in .chirp files needs to be re-written
+ # bank_id = _get("/bank/@bankId")
+ # if bank_id:
+ # mem.bank = int(bank_id)
+ # bank_index = _get("/bank/@bankIndex")
+ # if bank_index:
+ # mem.bank_index = int(bank_index)
return mem
@@ -175,12 +175,12 @@ def set_memory(doc, mem):
skip = memnode.newChild(None, "skip", None)
skip.addContent(mem.skip)
- #FIXME: .chirp bank support needs to be redone
- #if mem.bank is not None:
- # bank = memnode.newChild(None, "bank", None)
- # bank.newProp("bankId", str(int(mem.bank)))
- # if mem.bank_index >= 0:
- # bank.newProp("bankIndex", str(int(mem.bank_index)))
+ # FIXME: .chirp bank support needs to be redone
+ # if mem.bank is not None:
+ # bank = memnode.newChild(None, "bank", None)
+ # bank.newProp("bankId", str(int(mem.bank)))
+ # if mem.bank_index >= 0:
+ # bank.newProp("bankIndex", str(int(mem.bank_index)))
if isinstance(mem, chirp_common.DVMemory):
dv = memnode.newChild(None, "dv", None)
diff --git a/chirpc b/chirpc
index 4981374..217ca9f 100755
--- a/chirpc
+++ b/chirpc
@@ -40,9 +40,6 @@ def fail_missing_mmap():
class ToneAction(argparse.Action):
-# def __init__(self, **kwargs):
-# super(ToneAction, self).__init__(**kwargs)
-
def __call__(self, parser, namespace, value, option_string=None):
if value in chirp_common.TONES:
raise argparse.ArgumentError("Invalid tone valeu: %.1f" % value)
@@ -296,12 +293,12 @@ if __name__ == "__main__":
print mem
if options.download_mmap:
- #isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported()
+ # isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported()
radio.sync_in()
radio.save_mmap(options.mmap)
if options.upload_mmap:
- #isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported()
+ # isinstance(radio, chirp_common.IcomMmapRadio) or fail_unsupported()
radio.load_mmap(options.mmap)
if radio.sync_out():
print "Clone successful"
diff --git a/chirpui/clone.py b/chirpui/clone.py
index e9443b0..63f6f10 100644
--- a/chirpui/clone.py
+++ b/chirpui/clone.py
@@ -60,7 +60,7 @@ class CloneSettingsDialog(gtk.Dialog):
port = ports[0]
else:
port = ""
- if not port in ports:
+ if port not in ports:
ports.insert(0, port)
return miscwidgets.make_choice(ports, True, port)
diff --git a/chirpw b/chirpw
index 073ef50..353edc9 100755
--- a/chirpw
+++ b/chirpw
@@ -20,10 +20,9 @@ import os
from chirp import logger
from chirp import elib_intl
from chirp import platform
+from chirp import *
from chirpui import config
-# Hack to setup environment
-platform.get_platform()
import sys
import os
@@ -31,6 +30,7 @@ import locale
import gettext
import argparse
+
execpath = platform.get_platform().executable_path()
localepath = os.path.abspath(os.path.join(execpath, "locale"))
if not os.path.exists(localepath):
@@ -77,8 +77,6 @@ gettext.textdomain("CHIRP")
lang = gettext.translation("CHIRP", localepath, languages=langs,
fallback=True)
-import gtk
-
# Python <2.6 does not have str.format(), which chirp uses to make translation
# strings nicer. So, instead of installing the gettext standard "_()" function,
@@ -111,9 +109,6 @@ else:
# Python >=2.6, use normal gettext behavior
lang.install()
-from chirp import *
-from chirpui import mainapp, config
-
parser = argparse.ArgumentParser()
parser.add_argument("files", metavar="file", nargs='*', help="File to open")
logger.add_version_argument(parser)
@@ -124,7 +119,10 @@ args = parser.parse_args()
logger.handle_options(args)
-a = mainapp.ChirpMain()
+a = None
+if True:
+ from chirpui import mainapp
+ a = mainapp.ChirpMain()
for i in args.files:
print "Opening %s" % i
@@ -135,10 +133,12 @@ a.show()
if args.profile:
import cProfile
import pstats
+ import gtk
cProfile.run("gtk.main()", "chirpw.stats")
p = pstats.Stats("chirpw.stats")
p.sort_stats("cumulative").print_stats(10)
else:
+ import gtk
gtk.main()
if config._CONFIG:
diff --git a/setup.py b/setup.py
index b923670..037121f 100644
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,7 @@ def macos_build():
EXEC = 'bash ./build/macos/make_pango.sh ' + \
'/opt/local dist/chirp-%s.app' % CHIRP_VERSION
- #print "exec string: %s" % EXEC
+ # print "exec string: %s" % EXEC
os.system(EXEC)
@@ -95,7 +95,7 @@ def default_build():
os.system("make -C locale clean all")
desktop_files = glob("share/*.desktop")
- #form_files = glob("forms/*.x?l")
+ # form_files = glob("forms/*.x?l")
image_files = glob("images/*")
_locale_files = glob("locale/*/LC_MESSAGES/CHIRP.mo")
stock_configs = glob("stock_configs/*")
diff --git a/tools/cpep8.sh b/tools/cpep8.sh
index 8522692..88a7af9 100755
--- a/tools/cpep8.sh
+++ b/tools/cpep8.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Runs cpep.py with the proper verion of the pep8 library.
-PEP8_VERSION="1.4.6"
+PEP8_VERSION="1.6.2"
TOOLS_DIR="$(dirname $0)"
VENV="${TMPDIR:-${TOOLS_DIR}}/cpep8.venv"
More information about the chirp_devel
mailing list