aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chirp/drivers/__pycache__/ft60.cpython-38.pycbin0 -> 19909 bytes
-rw-r--r--chirp/drivers/__pycache__/kguv8d.cpython-38.pycbin0 -> 24224 bytes
-rw-r--r--chirp/drivers/__pycache__/wouxun.cpython-38.pycbin0 -> 37727 bytes
-rw-r--r--chirp/drivers/ft60.py6
-rw-r--r--chirp/drivers/kguv8d.py6
-rw-r--r--chirp/drivers/wouxun.py14
6 files changed, 13 insertions, 13 deletions
diff --git a/chirp/drivers/__pycache__/ft60.cpython-38.pyc b/chirp/drivers/__pycache__/ft60.cpython-38.pyc
new file mode 100644
index 0000000..0c9bf54
--- /dev/null
+++ b/chirp/drivers/__pycache__/ft60.cpython-38.pyc
Binary files differ
diff --git a/chirp/drivers/__pycache__/kguv8d.cpython-38.pyc b/chirp/drivers/__pycache__/kguv8d.cpython-38.pyc
new file mode 100644
index 0000000..de54be6
--- /dev/null
+++ b/chirp/drivers/__pycache__/kguv8d.cpython-38.pyc
Binary files differ
diff --git a/chirp/drivers/__pycache__/wouxun.cpython-38.pyc b/chirp/drivers/__pycache__/wouxun.cpython-38.pyc
new file mode 100644
index 0000000..99024f7
--- /dev/null
+++ b/chirp/drivers/__pycache__/wouxun.cpython-38.pyc
Binary files differ
diff --git a/chirp/drivers/ft60.py b/chirp/drivers/ft60.py
index 3c00d84..47deab5 100644
--- a/chirp/drivers/ft60.py
+++ b/chirp/drivers/ft60.py
@@ -403,7 +403,7 @@ class FT60Radio(yaesu_clone.YaesuCloneModeRadio):
self._mmap = _download(self)
except errors.RadioError:
raise
- except Exception, e:
+ except (Exception, e):
raise errors.RadioError("Failed to communicate with radio: %s" % e)
self.process_mmap()
self.check_checksums()
@@ -414,7 +414,7 @@ class FT60Radio(yaesu_clone.YaesuCloneModeRadio):
_upload(self)
except errors.RadioError:
raise
- except Exception, e:
+ except (Exception, e):
raise errors.RadioError("Failed to communicate with radio: %s" % e)
def process_mmap(self):
@@ -716,7 +716,7 @@ class FT60Radio(yaesu_clone.YaesuCloneModeRadio):
setattr(_settings, name, value)
LOG.debug("Setting %s: %s" % (name, value))
- except Exception, e:
+ except (Exception, e):
LOG.debug(element.get_name())
raise
diff --git a/chirp/drivers/kguv8d.py b/chirp/drivers/kguv8d.py
index 5fe16b4..cab4830 100644
--- a/chirp/drivers/kguv8d.py
+++ b/chirp/drivers/kguv8d.py
@@ -376,7 +376,7 @@ class KGUV8DRadio(chirp_common.CloneModeRadio,
self._mmap = self._download()
except errors.RadioError:
raise
- except Exception, e:
+ except (Exception, e):
raise errors.RadioError("Failed to communicate with radio: %s" % e)
self.process_mmap()
@@ -393,7 +393,7 @@ class KGUV8DRadio(chirp_common.CloneModeRadio,
return self._do_download(0, 32768, 64)
except errors.RadioError:
raise
- except Exception, e:
+ except (Exception, e):
LOG.exception('Unknown error during download process')
raise errors.RadioError("Failed to communicate with radio: %s" % e)
@@ -426,7 +426,7 @@ class KGUV8DRadio(chirp_common.CloneModeRadio,
self._do_upload(0, 32768, 64)
except errors.RadioError:
raise
- except Exception, e:
+ except (Exception, e):
raise errors.RadioError("Failed to communicate with radio: %s" % e)
return
diff --git a/chirp/drivers/wouxun.py b/chirp/drivers/wouxun.py
index 21a1767..6c88953 100644
--- a/chirp/drivers/wouxun.py
+++ b/chirp/drivers/wouxun.py
@@ -274,7 +274,7 @@ class KGUVD1PRadio(chirp_common.CloneModeRadio,
return do_download(self, 0x0000, 0x2000, 0x0040)
except errors.RadioError:
raise
- except Exception, e:
+ except (Exception, e):
raise errors.RadioError("Failed to communicate with radio: %s" % e)
def _upload(self):
@@ -285,7 +285,7 @@ class KGUVD1PRadio(chirp_common.CloneModeRadio,
return do_upload(self, 0x0000, 0x2000, 0x0010)
except errors.RadioError:
raise
- except Exception, e:
+ except (Exception, e):
raise errors.RadioError("Failed to communicate with radio: %s" % e)
def sync_in(self):
@@ -658,7 +658,7 @@ class KGUVD1PRadio(chirp_common.CloneModeRadio,
else:
LOG.debug("Setting %s = %s" % (setting, element.value))
setattr(obj, setting, element.value)
- except Exception, e:
+ except (Exception, e):
LOG.debug(element.get_name())
raise
@@ -680,7 +680,7 @@ class KGUVD1PRadio(chirp_common.CloneModeRadio,
else:
setting = self._memobj.fm_presets_1
setting[index] = value
- except Exception, e:
+ except (Exception, e):
LOG.debug(element.get_name())
raise
@@ -690,7 +690,7 @@ class KGUVD1PRadio(chirp_common.CloneModeRadio,
setattr(self._memobj.freq_ranges,
element.get_name(),
encode_freq(int(element.value)))
- except Exception, e:
+ except (Exception, e):
LOG.debug(element.get_name())
raise
@@ -1397,7 +1397,7 @@ class KGUV6DRadio(KGUVD1PRadio):
else:
LOG.debug("Setting %s = %s" % (setting, element.value))
setattr(obj, setting, element.value)
- except Exception, e:
+ except (Exception, e):
LOG.debug(element.get_name())
raise
@@ -1419,7 +1419,7 @@ class KGUV6DRadio(KGUVD1PRadio):
else:
setting = self._memobj.fm_presets_1
setting[index] = value
- except Exception, e:
+ except (Exception, e):
LOG.debug(element.get_name())
raise