Python 3: except exception, e -> except as e

source/NVDAObjects/IAccessible/__init__.py

@@ -608,7 +608,7 @@ def __init__(self,windowHandle=None,IAccessibleObject=None,IAccessibleChildID=No
 			try:
 				left,top,width,height = IAccessibleObject.accLocation(0)
 				windowHandle=winUser.user32.WindowFromPoint(winUser.POINT(left,top))
-			except COMError, e:
+			except COMError as e:
 				log.debugWarning("accLocation failed: %s" % e)
 		if not windowHandle:
 			raise InvalidNVDAObject("Can't get a window handle from IAccessible")

source/NVDAObjects/IAccessible/adobeFlash.py

@@ -21,7 +21,7 @@ def _getStoryText(self):
 	def _getRawSelectionOffsets(self):
 		try:
 			return self.obj.ISimpleTextSelectionObject.GetSelection()
-		except COMError, e:
+		except COMError as e:
 			if e.hresult == hresult.E_FAIL:
 				# The documentation says that an empty field should return 0 for both values, but instead, we seem to get E_FAIL.
 				# An empty field still has a valid caret.

source/gui/logViewer.py

@@ -83,7 +83,7 @@ def onSaveAsCommand(self, evt):
 			# #9038: work with UTF-8 from the start.
 			with open(filename, "w", encoding="UTF-8") as f:
 				f.write(self.outputCtrl.GetValue())
-		except (IOError, OSError), e:
+		except (IOError, OSError) as e:
 			# Translators: Dialog text presented when NVDA cannot save a log file.
 			gui.messageBox(_("Error saving log: %s") % e.strerror, _("Error"), style=wx.OK | wx.ICON_ERROR, parent=self)
 

source/inputCore.py

@@ -243,7 +243,7 @@ def load(self, filename):
 		self.fileName = filename
 		try:
 			conf = configobj.ConfigObj(filename, file_error=True, encoding="UTF-8")
-		except (configobj.ConfigObjError,UnicodeDecodeError), e:
+		except (configobj.ConfigObjError,UnicodeDecodeError) as e:
 			log.warning("Error in gesture map '%s': %s"%(filename, e))
 			self.lastUpdateContainedError = True
 			return

source/nvda_slave.pyw

@@ -100,7 +100,7 @@ def main():
 	except installer.RetriableFailure:
 		logHandler.log.error("Task failed, try again",exc_info=True)
 		sys.exit(2)
-	except Exception, e:
+	except Exception as e:
 		logHandler.log.error("slave error",exc_info=True)
 		sys.exit(1)
 

source/nvwave.py

@@ -214,7 +214,7 @@ def _feedUnbuffered(self, data, onDone=None):
 				try:
 					with self._global_waveout_lock:
 						winmm.waveOutWrite(self._waveout, LPWAVEHDR(whdr), sizeof(WAVEHDR))
-				except WindowsError, e:
+				except WindowsError as e:
 					self.close()
 					raise e
 			self.sync()