syntax fixes for drivers

52 files changed, 122 insertions, 122 deletions

diff --git a/chirp/drivers/alinco.py b/chirp/drivers/alinco.py
index 747a176..dcd45f5 100644
--- a/chirp/drivers/alinco.py
+++ b/chirp/drivers/alinco.py
@@ -134,7 +134,7 @@ class AlincoStyleRadio(chirp_common.CloneModeRadio):
         return data
 
     def _download(self, limit):
-        self._identify()
+        seexcept (Exception, e):lf._identify()
 
         data = ""
         for addr in range(0, limit, 16):
@@ -199,7 +199,7 @@ class AlincoStyleRadio(chirp_common.CloneModeRadio):
             self._mmap = self._download(self._memsize)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         self.process_mmap()
 
@@ -208,7 +208,7 @@ class AlincoStyleRadio(chirp_common.CloneModeRadio):
             self._upload(self._memsize)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
     def get_raw_memory(self, number):
diff --git a/chirp/drivers/anytone.py b/chirp/drivers/anytone.py
index 7010750..36a5372 100644
--- a/chirp/drivers/anytone.py
+++ b/chirp/drivers/anytone.py
@@ -177,7 +177,7 @@ def _echo_write(radio, data):
     try:
         radio.pipe.write(data)
         radio.pipe.read(len(data))
-    except (Exception, e):
+    except Exception as e:
         LOG.error("Error writing to radio: %s" % e)
         raise errors.RadioError("Unable to write to radio")
 
@@ -185,7 +185,7 @@ def _echo_write(radio, data):
 def _read(radio, length):
     try:
         data = radio.pipe.read(length)
-    except (Exception, e):
+    except Exception as e:
         LOG.error("Error reading from radio: %s" % e)
         raise errors.RadioError("Unable to read from radio")
 
diff --git a/chirp/drivers/anytone_ht.py b/chirp/drivers/anytone_ht.py
index 8bd9dec..bc48224 100644
--- a/chirp/drivers/anytone_ht.py
+++ b/chirp/drivers/anytone_ht.py
@@ -233,7 +233,7 @@ struct memory memory[200];
 def _echo_write(radio, data):
     try:
         radio.pipe.write(data)
-    except (Exception, e):
+    except Exception as e:
         LOG.error("Error writing to radio: %s" % e)
         raise errors.RadioError("Unable to write to radio")
 
@@ -241,7 +241,7 @@ def _echo_write(radio, data):
 def _read(radio, length):
     try:
         data = radio.pipe.read(length)
-    except (Exception, e):
+    except Exception as e:
         LOG.error("Error reading from radio: %s" % e)
         raise errors.RadioError("Unable to read from radio")
 
@@ -930,7 +930,7 @@ class AnyToneTERMN8RRadio(chirp_common.CloneModeRadio,
                     else:
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/ap510.py b/chirp/drivers/ap510.py
index 07019b6..f905d31 100644
--- a/chirp/drivers/ap510.py
+++ b/chirp/drivers/ap510.py
@@ -380,7 +380,7 @@ class AP510Radio(chirp_common.CloneModeRadio):
             data = download(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
         # _mmap isn't a Chirp MemoryMap, but since AP510Memory implements
@@ -398,7 +398,7 @@ class AP510Radio(chirp_common.CloneModeRadio):
             upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
     def load_mmap(self, filename):
diff --git a/chirp/drivers/baofeng_common.py b/chirp/drivers/baofeng_common.py
index ed131f2..6ca1b76 100644
--- a/chirp/drivers/baofeng_common.py
+++ b/chirp/drivers/baofeng_common.py
@@ -164,7 +164,7 @@ def _ident_radio(radio):
         try:
             data = _do_ident(radio, magic)
             return data
-        except (errors.RadioError, e):
+        except errors.RadioError as e:
             print (e)
             error = e
             time.sleep(2)
@@ -336,7 +336,7 @@ class BaofengCommonHT(chirp_common.CloneModeRadio,
             _upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             # If anything unexpected happens, make sure we raise
             # a RadioError and log the problem
             LOG.exception('Unexpected error during upload')
@@ -622,7 +622,7 @@ class BaofengCommonHT(chirp_common.CloneModeRadio,
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
@@ -636,6 +636,6 @@ class BaofengCommonHT(chirp_common.CloneModeRadio,
                     value = int(val.get_value() * 10)
                 LOG.debug("Setting fm_presets = %s" % (value))
                 self._memobj.fm_presets = value
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
diff --git a/chirp/drivers/baofeng_uv3r.py b/chirp/drivers/baofeng_uv3r.py
index b1176e8..e73bd9f 100644
--- a/chirp/drivers/baofeng_uv3r.py
+++ b/chirp/drivers/baofeng_uv3r.py
@@ -51,7 +51,7 @@ def uv3r_prep(radio):
     for _i in range(0, 10):
         try:
             return _uv3r_prep(radio)
-        except (errors.RadioError, e):
+        except errors.RadioError as e:
             time.sleep(1)
 
     raise e
@@ -64,7 +64,7 @@ def uv3r_download(radio):
         return do_download(radio, 0x0000, 0x0E40, 0x0010)
     except errors.RadioError:
         raise
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
 
@@ -75,7 +75,7 @@ def uv3r_upload(radio):
         return do_upload(radio, 0x0000, 0x0E40, 0x0010)
     except errors.RadioError:
         raise
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
 
@@ -623,7 +623,7 @@ class UV3RRadio(chirp_common.CloneModeRadio):
                     else:
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
@@ -639,7 +639,7 @@ class UV3RRadio(chirp_common.CloneModeRadio):
                 LOG.debug("Setting fm_presets[%1i] = %s" % (index, value))
                 setting = self._memobj.fm_presets
                 setting[index] = value
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/bf-t1.py b/chirp/drivers/bf-t1.py
index fdbf81c..f93972f 100644
--- a/chirp/drivers/bf-t1.py
+++ b/chirp/drivers/bf-t1.py
@@ -225,7 +225,7 @@ def _start_clone_mode(radio, status):
 
     except errors.RadioError:
         raise
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Error sending Magic to radio:\n%s" % e)
 
 
@@ -561,7 +561,7 @@ class BFT1(chirp_common.CloneModeRadio, chirp_common.ExperimentalRadio):
             _upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Error: %s" % e)
 
     def _decode_tone(self, val, inv):
@@ -894,7 +894,7 @@ class BFT1(chirp_common.CloneModeRadio, chirp_common.ExperimentalRadio):
                     setattr(_settings, name, value)
 
                 LOG.debug("Setting %s: %s" % (name, value))
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/bj9900.py b/chirp/drivers/bj9900.py
index aa9a250..87d1b80 100644
--- a/chirp/drivers/bj9900.py
+++ b/chirp/drivers/bj9900.py
@@ -178,7 +178,7 @@ class BJ9900Radio(chirp_common.CloneModeRadio,
             self._mmap = self._clone_in()
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         self.process_mmap()
 
@@ -187,7 +187,7 @@ class BJ9900Radio(chirp_common.CloneModeRadio,
             self._clone_out()
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
     def process_mmap(self):
diff --git a/chirp/drivers/bjuv55.py b/chirp/drivers/bjuv55.py
index 225e3cd..76797cc 100644
--- a/chirp/drivers/bjuv55.py
+++ b/chirp/drivers/bjuv55.py
@@ -647,6 +647,6 @@ class BaojieBJUV55Radio(uv5r.BaofengUV5R):
                 value = int(val.get_value() * 10 - 870)
                 LOG.debug("Setting fm_preset = %s" % (value))
                 self._memobj.fm_preset = value
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
diff --git a/chirp/drivers/fd268.py b/chirp/drivers/fd268.py
index fc54539..38379af 100644
--- a/chirp/drivers/fd268.py
+++ b/chirp/drivers/fd268.py
@@ -790,11 +790,11 @@ class FeidaxinFD2x8yRadio(chirp_common.CloneModeRadio):
                         obj = getattr(_mem, sett)
                         setattr(obj, name, element.value)
 
-                    except (AttributeError, e):
+                    except AttributeError as e:
                         m = "Setting %s is not in this setting block" % name
                         LOG.debug(m)
 
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/ft1d.py b/chirp/drivers/ft1d.py
index 2cae7ba..994342a 100644
--- a/chirp/drivers/ft1d.py
+++ b/chirp/drivers/ft1d.py
@@ -1890,7 +1890,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio):
                 except AttributeError as e:
                     LOG.error("Setting %s is not in the memory map: %s" %
                               (element.get_name(), e))
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/ft2800.py b/chirp/drivers/ft2800.py
index fa35145..860f570 100644
--- a/chirp/drivers/ft2800.py
+++ b/chirp/drivers/ft2800.py
@@ -201,7 +201,7 @@ class FT2800Radio(YaesuCloneModeRadio):
             self._mmap = _download(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         LOG.info("Downloaded in %.2f sec" % (time.time() - start))
         self.process_mmap()
@@ -214,7 +214,7 @@ class FT2800Radio(YaesuCloneModeRadio):
             _upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         LOG.info("Uploaded in %.2f sec" % (time.time() - start))
 
diff --git a/chirp/drivers/ft2900.py b/chirp/drivers/ft2900.py
index 23f2d22..593c6e3 100644
--- a/chirp/drivers/ft2900.py
+++ b/chirp/drivers/ft2900.py
@@ -537,7 +537,7 @@ class FT2900Radio(YaesuCloneModeRadio):
             self._mmap = _download(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         LOG.info("Downloaded in %.2f sec" % (time.time() - start))
         self.process_mmap()
@@ -549,7 +549,7 @@ class FT2900Radio(YaesuCloneModeRadio):
             _upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         LOG.info("Uploaded in %.2f sec" % (time.time() - start))
 
@@ -1210,7 +1210,7 @@ class FT2900Radio(YaesuCloneModeRadio):
                     setattr(_settings, name, value)
 
                 LOG.debug("Setting %s: %s" % (name, value))
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/ft450d.py b/chirp/drivers/ft450d.py
index 319feb1..12af6b8 100644
--- a/chirp/drivers/ft450d.py
+++ b/chirp/drivers/ft450d.py
@@ -499,7 +499,7 @@ class FT450DRadio(yaesu_clone.YaesuCloneModeRadio):
             self._mmap = self._clone_in()

         except errors.RadioError:

             raise

-        except (Exception, e):

+        except Exception as e:

             raise errors.RadioError("Failed to communicate with radio: %s"

                                     % e)

         self.process_mmap()

@@ -509,7 +509,7 @@ class FT450DRadio(yaesu_clone.YaesuCloneModeRadio):
             self._clone_out()

         except errors.RadioError:

             raise

-        except (Exception, e):

+        except Exception as e:

             raise errors.RadioError("Failed to communicate with radio: %s"

                                     % e)

 

@@ -1489,6 +1489,6 @@ class FT450DRadio(yaesu_clone.YaesuCloneModeRadio):
                     elif element.value.get_mutable():

                         LOG.debug("Setting %s = %s" % (setting, element.value))

                         setattr(obj, setting, element.value)

-                except (Exception, e):

+                except Exception as e:

                     LOG.debug(element.get_name())

                     raise

diff --git a/chirp/drivers/ft50.py b/chirp/drivers/ft50.py
index f083a09..73c3045 100644
--- a/chirp/drivers/ft50.py
+++ b/chirp/drivers/ft50.py
@@ -586,7 +586,7 @@ class FT50Radio(yaesu_clone.YaesuCloneModeRadio):
 def _clone_out(radio):
     try:
         return __clone_out(radio)
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with the radio: %s" % e)
 
 
diff --git a/chirp/drivers/ft60.py b/chirp/drivers/ft60.py
index 47deab5..9e44f56 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 as 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 as 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 as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/ft70.py b/chirp/drivers/ft70.py
index 9aed7cb..31c712b 100644
--- a/chirp/drivers/ft70.py
+++ b/chirp/drivers/ft70.py
@@ -1162,7 +1162,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio):
                 except AttributeError as e:

                     LOG.error("Setting %s is not in the memory map: %s" %

                               (element.get_name(), e))

-            except (Exception, e):

+            except Exception as e:

                 LOG.debug(element.get_name())

                 raise

 

diff --git a/chirp/drivers/ft7100.py b/chirp/drivers/ft7100.py
index 700be65..5b4bb73 100644
--- a/chirp/drivers/ft7100.py
+++ b/chirp/drivers/ft7100.py
@@ -568,7 +568,7 @@ class FT7100Radio(YaesuCloneModeRadio):
             self._mmap = _download(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         LOG.info("Downloaded in %.2f sec", (time.time() - start))
         self.process_mmap()
@@ -580,7 +580,7 @@ class FT7100Radio(YaesuCloneModeRadio):
             _upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         LOG.info("Uploaded in %.2f sec", (time.time() - start))
 
@@ -1091,7 +1091,7 @@ class FT7100Radio(YaesuCloneModeRadio):
                     setattr(_overlay, name, value)
 
                 LOG.debug("Setting %s: %s", name, value)
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/ft8100.py b/chirp/drivers/ft8100.py
index 74d3f25..e4cc247 100644
--- a/chirp/drivers/ft8100.py
+++ b/chirp/drivers/ft8100.py
@@ -270,7 +270,7 @@ class FT8100RadioUHF(FT8100Radio):
 def _clone_out(radio):
     try:
         return __clone_out(radio)
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with the radio: %s" % e)
 
 
diff --git a/chirp/drivers/ft90.py b/chirp/drivers/ft90.py
index 3163b75..ba6444e 100644
--- a/chirp/drivers/ft90.py
+++ b/chirp/drivers/ft90.py
@@ -332,7 +332,7 @@ struct  {
             self._mmap = self._clone_in()
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             trace = traceback.format_exc()
             raise errors.RadioError(
                     "Failed to communicate with radio: %s" % trace)
@@ -343,7 +343,7 @@ struct  {
             self._clone_out()
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             trace = traceback.format_exc()
             raise errors.RadioError(
                     "Failed to communicate with radio: %s" % trace)
@@ -670,6 +670,6 @@ struct  {
                     newval = self._dtmf2bbcd(newval)
                 LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval))
                 setattr(_settings, setting, newval)
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
diff --git a/chirp/drivers/ftm350.py b/chirp/drivers/ftm350.py
index f277bb3..5332a74 100644
--- a/chirp/drivers/ftm350.py
+++ b/chirp/drivers/ftm350.py
@@ -278,7 +278,7 @@ class FTM350Radio(yaesu_clone.YaesuCloneModeRadio):
             self._mmap = _clone_in(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to download from radio (%s)" % e)
         self.process_mmap()
 
@@ -287,7 +287,7 @@ class FTM350Radio(yaesu_clone.YaesuCloneModeRadio):
             _clone_out(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to upload to radio (%s)" % e)
 
     def process_mmap(self):
diff --git a/chirp/drivers/kguv8d.py b/chirp/drivers/kguv8d.py
index cab4830..0d64b10 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 as 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 as 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 as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         return
 
diff --git a/chirp/drivers/kguv8dplus.py b/chirp/drivers/kguv8dplus.py
index 0eb523b..64f09ae 100644
--- a/chirp/drivers/kguv8dplus.py
+++ b/chirp/drivers/kguv8dplus.py
@@ -418,7 +418,7 @@ class KGUV8DPlusRadio(chirp_common.CloneModeRadio,
             self._mmap = self._download()
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         self.process_mmap()
 
@@ -435,7 +435,7 @@ class KGUV8DPlusRadio(chirp_common.CloneModeRadio,
             return self._do_download(0, 32768, 64)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             LOG.exception('Unknown error during download process')
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
@@ -467,7 +467,7 @@ class KGUV8DPlusRadio(chirp_common.CloneModeRadio,
             self._do_upload(0, 32768, 64)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         return
 
@@ -1103,7 +1103,7 @@ class KGUV8DPlusRadio(chirp_common.CloneModeRadio,
                             setattr(obj, setting, int(element.value)/10)
                         else:
                             setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/kguv8e.py b/chirp/drivers/kguv8e.py
index 18a1293..8ab26cf 100644
--- a/chirp/drivers/kguv8e.py
+++ b/chirp/drivers/kguv8e.py
@@ -337,7 +337,7 @@ class KGUV8ERadio(chirp_common.CloneModeRadio,
 
         try:
             self.pipe.write(_header)
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
     def _read_record(self):
@@ -423,7 +423,7 @@ class KGUV8ERadio(chirp_common.CloneModeRadio,
             self._mmap = self._download()
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         self.process_mmap()
 
@@ -440,7 +440,7 @@ class KGUV8ERadio(chirp_common.CloneModeRadio,
             return self._do_download(0, 32768, 64)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             LOG.exception('Unknown error during download process')
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
@@ -472,7 +472,7 @@ class KGUV8ERadio(chirp_common.CloneModeRadio,
             self._do_upload(0, 32768, 64)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         return
 
@@ -1138,7 +1138,7 @@ class KGUV8ERadio(chirp_common.CloneModeRadio,
                             setattr(obj, setting, int(element.value)/10)
                         else:
                             setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/kguv9dplus.py b/chirp/drivers/kguv9dplus.py
index 4907a1c..9355f55 100644
--- a/chirp/drivers/kguv9dplus.py
+++ b/chirp/drivers/kguv9dplus.py
@@ -877,7 +877,7 @@ class KGUV9DPlusRadio(chirp_common.CloneModeRadio,
             self._write_record(CMD_HANGUP)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             LOG.exception('Unknown error during download process')
             raise errors.RadioError(
                 "Failed to communicate with radio: %s" % e)
@@ -894,7 +894,7 @@ class KGUV9DPlusRadio(chirp_common.CloneModeRadio,
             self._write_record(CMD_HANGUP)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError(
                 "Failed to communicate with radio: %s" % e)
         return
@@ -1887,7 +1887,7 @@ class KGUV9DPlusRadio(chirp_common.CloneModeRadio,
                             setattr(obj, setting, int(element.value)/10)
                         else:
                             setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug("set_settings: Exception with %s" %
                               element.get_name())
                     raise
diff --git a/chirp/drivers/kyd.py b/chirp/drivers/kyd.py
index f559e74..8ef3f9b 100644
--- a/chirp/drivers/kyd.py
+++ b/chirp/drivers/kyd.py
@@ -500,7 +500,7 @@ class NC630aRadio(chirp_common.CloneModeRadio):
 
                     LOG.debug("Setting %s = %s" % (setting, element.value))
                     setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/kyd_IP620.py b/chirp/drivers/kyd_IP620.py
index dcdc23e..d750c7f 100644
--- a/chirp/drivers/kyd_IP620.py
+++ b/chirp/drivers/kyd_IP620.py
@@ -181,7 +181,7 @@ class IP620Radio(chirp_common.CloneModeRadio,
             self.pipe.write("\x06")
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Radio refused to exit programming mode: %s" % e)
 
     def _ip620_enter_programming_mode(self):
@@ -192,7 +192,7 @@ class IP620Radio(chirp_common.CloneModeRadio,
             _ack = self.pipe.read(1)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Error communicating with radio: %s" % e)
         if not _ack:
             raise errors.RadioError("No response from radio")
@@ -203,7 +203,7 @@ class IP620Radio(chirp_common.CloneModeRadio,
             _ident = self.pipe.read(8)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Error communicating with radio: %s" % e)
         if not _ident.startswith("\x06\x4B\x47\x36\x37\x01\x56\xF8"):
             print (util.hexprint(_ident))
@@ -213,7 +213,7 @@ class IP620Radio(chirp_common.CloneModeRadio,
             _ack = self.pipe.read(1)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Error communicating with radio: %s" % e)
         if _ack != CMD_ACK:
             raise errors.RadioError("Radio refused to enter programming mode")
@@ -316,7 +316,7 @@ class IP620Radio(chirp_common.CloneModeRadio,
             self._mmap = self._do_download()
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         self.process_mmap()
 
@@ -597,7 +597,7 @@ class IP620Radio(chirp_common.CloneModeRadio,
                 setattr(self._memobj.settings_misc,
                         element.get_name(),
                         element.value)
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
@@ -624,6 +624,6 @@ class IP620Radio(chirp_common.CloneModeRadio,
                     setattr(_settings_misc, setting, newval)
                 else:
                     setattr(_settings, setting, newval)
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
diff --git a/chirp/drivers/leixen.py b/chirp/drivers/leixen.py
index e401e1a..fd580d4 100644
--- a/chirp/drivers/leixen.py
+++ b/chirp/drivers/leixen.py
@@ -261,7 +261,7 @@ def send(radio, frame):
     #            util.hexprint(frame).replace("\n", "\n          ")))
     try:
         radio.pipe.write(frame)
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
 
@@ -427,7 +427,7 @@ class LeixenVV898Radio(chirp_common.CloneModeRadio):
     def sync_in(self):
         try:
             self._mmap = do_download(self)
-        except (Exception, e):
+        except Exception as e:
             finish(self)
             raise errors.RadioError("Failed to download from radio: %s" % e)
         self.process_mmap()
@@ -442,7 +442,7 @@ class LeixenVV898Radio(chirp_common.CloneModeRadio):
         except errors.RadioError:
             finish(self)
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to upload to radio: %s" % e)
 
     def get_raw_memory(self, number):
@@ -941,7 +941,7 @@ class LeixenVV898Radio(chirp_common.CloneModeRadio):
                     else:
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/lt725uv.py b/chirp/drivers/lt725uv.py
index 7762e1b..1a87d13 100644
--- a/chirp/drivers/lt725uv.py
+++ b/chirp/drivers/lt725uv.py
@@ -1393,7 +1393,7 @@ class LT725UV(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/puxing.py b/chirp/drivers/puxing.py
index 9eb25f6..8bb8411 100644
--- a/chirp/drivers/puxing.py
+++ b/chirp/drivers/puxing.py
@@ -47,7 +47,7 @@ def puxing_prep(radio):
     for _i in range(0, 10):
         try:
             return _puxing_prep(radio)
-        except (Exception, e):
+        except Exception as e:
             time.sleep(1)
 
     raise e
@@ -60,7 +60,7 @@ def puxing_download(radio):
         return do_download(radio, 0x0000, 0x0C60, 0x0008)
     except errors.RadioError:
         raise
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
 
@@ -71,7 +71,7 @@ def puxing_upload(radio):
         return do_upload(radio, 0x0000, 0x0C40, 0x0008)
     except errors.RadioError:
         raise
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
 POWER_LEVELS = [chirp_common.PowerLevel("High", watts=5.00),
@@ -372,7 +372,7 @@ def puxing_2r_download(radio):
         return do_download(radio, 0x0000, 0x0FE0, 0x0010)
     except errors.RadioError:
         raise
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
 
@@ -383,7 +383,7 @@ def puxing_2r_upload(radio):
         return do_upload(radio, 0x0000, 0x0FE0, 0x0010)
     except errors.RadioError:
         raise
-    except (Exception, e):
+    except Exception as e:
         raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
 PUXING_2R_MEM_FORMAT = """
diff --git a/chirp/drivers/radioddity_r2.py b/chirp/drivers/radioddity_r2.py
index b3bf1b6..909ec1c 100644
--- a/chirp/drivers/radioddity_r2.py
+++ b/chirp/drivers/radioddity_r2.py
@@ -611,7 +611,7 @@ class RadioddityR2Radio(chirp_common.CloneModeRadio):
 
                     LOG.debug("Setting %s = %s" % (setting, element.value))
                     setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/radtel_t18.py b/chirp/drivers/radtel_t18.py
index acd8776..4a5911d 100644
--- a/chirp/drivers/radtel_t18.py
+++ b/chirp/drivers/radtel_t18.py
@@ -478,7 +478,7 @@ class T18Radio(chirp_common.CloneModeRadio):
                     else:
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/retevis_rt1.py b/chirp/drivers/retevis_rt1.py
index 324e265..f030fd5 100644
--- a/chirp/drivers/retevis_rt1.py
+++ b/chirp/drivers/retevis_rt1.py
@@ -726,7 +726,7 @@ class RT1Radio(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/retevis_rt21.py b/chirp/drivers/retevis_rt21.py
index f2dda87..223549d 100644
--- a/chirp/drivers/retevis_rt21.py
+++ b/chirp/drivers/retevis_rt21.py
@@ -561,7 +561,7 @@ class RT21Radio(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
                     
diff --git a/chirp/drivers/retevis_rt22.py b/chirp/drivers/retevis_rt22.py
index ad755d7..efb13db 100644
--- a/chirp/drivers/retevis_rt22.py
+++ b/chirp/drivers/retevis_rt22.py
@@ -605,7 +605,7 @@ class RT22Radio(chirp_common.CloneModeRadio):
 
                     LOG.debug("Setting %s = %s" % (setting, element.value))
                     setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/retevis_rt23.py b/chirp/drivers/retevis_rt23.py
index 6398875..ad872dd 100644
--- a/chirp/drivers/retevis_rt23.py
+++ b/chirp/drivers/retevis_rt23.py
@@ -846,7 +846,7 @@ class RT23Radio(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/retevis_rt26.py b/chirp/drivers/retevis_rt26.py
index f99fee3..d3838af 100644
--- a/chirp/drivers/retevis_rt26.py
+++ b/chirp/drivers/retevis_rt26.py
@@ -897,7 +897,7 @@ class RT26Radio(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/rfinder.py b/chirp/drivers/rfinder.py
index 09a11d9..9abcc48 100644
--- a/chirp/drivers/rfinder.py
+++ b/chirp/drivers/rfinder.py
@@ -240,7 +240,7 @@ class RFinderParser:
                 dist = distance(self.__lat, self.__lon, lat, lon)
                 bear = fuzzy_to(self.__lat, self.__lon, lat, lon)
                 mem.comment = "(%imi %s) %s" % (dist, bear, mem.comment)
-            except (Exception, e):
+            except Exception as e:
                 LOG.error("Failed to calculate distance: %s" % e)
 
         return mem
@@ -258,7 +258,7 @@ class RFinderParser:
                 mem.number = number
                 number += 1
                 self.__memories.append(mem)
-            except (Exception, e):
+            except Exception as e:
                 import traceback
                 LOG.error(traceback.format_exc())
                 LOG.error("Error in received data, cannot continue")
diff --git a/chirp/drivers/tdxone_tdq8a.py b/chirp/drivers/tdxone_tdq8a.py
index 68c8348..0f33154 100644
--- a/chirp/drivers/tdxone_tdq8a.py
+++ b/chirp/drivers/tdxone_tdq8a.py
@@ -301,7 +301,7 @@ def _ident_radio(radio):
         try:
             data = _do_ident(radio, magic)
             return data
-        except (errors.RadioError, e):
+        except errors.RadioError as e:
             print (e)
             error = e
             time.sleep(2)
@@ -1117,7 +1117,7 @@ class TDXoneTDQ8A(chirp_common.CloneModeRadio,
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
@@ -1131,7 +1131,7 @@ class TDXoneTDQ8A(chirp_common.CloneModeRadio,
                     value = int(val.get_value() * 10)
                 LOG.debug("Setting fm_presets = %s" % (value))
                 self._memobj.fm_presets = value
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/th7800.py b/chirp/drivers/th7800.py
index 6257b2b..4fe32c6 100644
--- a/chirp/drivers/th7800.py
+++ b/chirp/drivers/th7800.py
@@ -536,7 +536,7 @@ class TYTTH7800Base(chirp_common.Radio):
 
                 LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval))
                 setattr(_settings, setting, newval)
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
@@ -726,7 +726,7 @@ class TYTTH7800Radio(TYTTH7800Base, chirp_common.CloneModeRadio,
     def sync_in(self):
         try:
             self._mmap = _download(self)
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError(
                     "Failed to communicate with the radio: %s" % e)
         self.process_mmap()
@@ -734,6 +734,6 @@ class TYTTH7800Radio(TYTTH7800Base, chirp_common.CloneModeRadio,
     def sync_out(self):
         try:
             _upload(self)
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError(
                     "Failed to communicate with the radio: %s" % e)
diff --git a/chirp/drivers/th9000.py b/chirp/drivers/th9000.py
index e73e6df..220e6bd 100644
--- a/chirp/drivers/th9000.py
+++ b/chirp/drivers/th9000.py
@@ -352,7 +352,7 @@ def _echo_write(radio, data):
     try:
         radio.pipe.write(data)
         radio.pipe.read(len(data))
-    except (Exception, e):
+    except Exception as e:
         LOG.error("Error writing to radio: %s" % e)
         raise errors.RadioError("Unable to write to radio")
 
@@ -366,7 +366,7 @@ def _checksum(data):
 def _read(radio, length):
     try:
         data = radio.pipe.read(length)
-    except (Exception, e):
+    except Exception as e:
         LOG.error( "Error reading from radio: %s" % e)
         raise errors.RadioError("Unable to read from radio")
 
@@ -793,7 +793,7 @@ class Th9000Radio(chirp_common.CloneModeRadio,
                     else:
                         LOG.debug( "Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug( element.get_name())
                     raise
 
diff --git a/chirp/drivers/th9800.py b/chirp/drivers/th9800.py
index 628dc09..2c7db89 100644
--- a/chirp/drivers/th9800.py
+++ b/chirp/drivers/th9800.py
@@ -598,7 +598,7 @@ class TYTTH9800Base(chirp_common.Radio):
 
                 LOG.debug("Setting %s(%s) <= %s" % (setting, oldval, newval))
                 setattr(_settings, setting, newval)
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
@@ -785,7 +785,7 @@ class TYTTH9800Radio(TYTTH9800Base, chirp_common.CloneModeRadio,
     def sync_in(self):
         try:
             self._mmap = _download(self)
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError(
                     "Failed to communicate with the radio: %s" % e)
         self.process_mmap()
@@ -793,6 +793,6 @@ class TYTTH9800Radio(TYTTH9800Base, chirp_common.CloneModeRadio,
     def sync_out(self):
         try:
             _upload(self)
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError(
                     "Failed to communicate with the radio: %s" % e)
diff --git a/chirp/drivers/th_uv8000.py b/chirp/drivers/th_uv8000.py
index 6c60e0e..f55bd90 100644
--- a/chirp/drivers/th_uv8000.py
+++ b/chirp/drivers/th_uv8000.py
@@ -1486,6 +1486,6 @@ class THUV8000Radio(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
diff --git a/chirp/drivers/thd72.py b/chirp/drivers/thd72.py
index 9e2491e..5b3d053 100644
--- a/chirp/drivers/thd72.py
+++ b/chirp/drivers/thd72.py
@@ -581,7 +581,7 @@ class THD72Radio(chirp_common.CloneModeRadio):
                 except AttributeError as e:
                     LOG.error("Setting %s is not in the memory map: %s" %
                               (element.get_name(), e))
-            except (Exception, e):
+            except Exception as e:
                 LOG.debug(element.get_name())
                 raise
 
diff --git a/chirp/drivers/thuv1f.py b/chirp/drivers/thuv1f.py
index af7181a..028a563 100644
--- a/chirp/drivers/thuv1f.py
+++ b/chirp/drivers/thuv1f.py
@@ -214,7 +214,7 @@ class TYTTHUVF1Radio(chirp_common.CloneModeRadio):
             self._mmap = uvf1_download(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
         self.process_mmap()
 
@@ -223,7 +223,7 @@ class TYTTHUVF1Radio(chirp_common.CloneModeRadio):
             uvf1_upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
     @classmethod
diff --git a/chirp/drivers/tk760g.py b/chirp/drivers/tk760g.py
index f77f9c1..212eb73 100644
--- a/chirp/drivers/tk760g.py
+++ b/chirp/drivers/tk760g.py
@@ -907,7 +907,7 @@ class Kenwood_Serie_60G(chirp_common.CloneModeRadio, chirp_common.ExperimentalRa
             do_upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate with radio: %s" % e)
 
     def process_mmap(self):
diff --git a/chirp/drivers/ts480.py b/chirp/drivers/ts480.py
index 4f34006..50d3b3e 100644
--- a/chirp/drivers/ts480.py
+++ b/chirp/drivers/ts480.py
@@ -1138,7 +1138,7 @@ class TS480Radio(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
         return
diff --git a/chirp/drivers/ts590.py b/chirp/drivers/ts590.py
index edbc71d..69e3928 100644
--- a/chirp/drivers/ts590.py
+++ b/chirp/drivers/ts590.py
@@ -1644,7 +1644,7 @@ class TS590Radio(chirp_common.CloneModeRadio):
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/vgc.py b/chirp/drivers/vgc.py
index 6574bd1..ebf733c 100644
--- a/chirp/drivers/vgc.py
+++ b/chirp/drivers/vgc.py
@@ -1410,7 +1410,7 @@ class VGCStyleRadio(chirp_common.CloneModeRadio,
                     elif element.value.get_mutable():
                         LOG.debug("Setting %s = %s" % (setting, element.value))
                         setattr(obj, setting, element.value)
-                except (Exception, e):
+                except Exception as e:
                     LOG.debug(element.get_name())
                     raise
 
diff --git a/chirp/drivers/vx6.py b/chirp/drivers/vx6.py
index 2693f56..6efc103 100644
--- a/chirp/drivers/vx6.py
+++ b/chirp/drivers/vx6.py
@@ -871,5 +871,5 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio):
                 elif setting == "password":
                     newval = self._encode_chars(newval, 4)
                 setattr(_settings, setting, newval)
-            except (Exception, e):
+            except Exception as e:
                 raise
diff --git a/chirp/drivers/vxa700.py b/chirp/drivers/vxa700.py
index 846d406..878acc2 100644
--- a/chirp/drivers/vxa700.py
+++ b/chirp/drivers/vxa700.py
@@ -177,7 +177,7 @@ class VXA700Radio(chirp_common.CloneModeRadio):
             self._mmap = _download(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate " +
                                     "with the radio: %s" % e)
         self.process_mmap()
@@ -192,7 +192,7 @@ class VXA700Radio(chirp_common.CloneModeRadio):
             _upload(self)
         except errors.RadioError:
             raise
-        except (Exception, e):
+        except Exception as e:
             raise errors.RadioError("Failed to communicate " +
                                     "with the radio: %s" % e)
 
diff --git a/chirp/drivers/wouxun.py b/chirp/drivers/wouxun.py
index 6c88953..733c801 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 as 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 as 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 as 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 as 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 as 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 as 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 as e:
                 LOG.debug(element.get_name())
                 raise