Merge e567be0 into 28d8aa5

LeonarddeR · web-flow · commit 2edae701da3c · 2022-12-20T21:42:36.000+10:00
diff --git a/source/addonHandler/__init__.py b/source/addonHandler/__init__.py
@@ -1,6 +1,6 @@
 # A part of NonVisual Desktop Access (NVDA)
 # Copyright (C) 2012-2022 Rui Batista, NV Access Limited, Noelia Ruiz Martínez,
-# Joseph Lee, Babbage B.V., Arnold Loubriat, Łukasz Golonka
+# Joseph Lee, Babbage B.V., Arnold Loubriat, Łukasz Golonka, Leonard de Ruijter
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -548,6 +548,10 @@ def getDocFilePath(self, fileName=None):
 				return docFile
 		return None
 
+	def __repr__(self):
+		return f"{self.__class__.__name__} ({self.name!r}, running={self.isRunning!r})"
+
+
 def getCodeAddon(obj=None, frameDist=1):
 	""" Returns the L{Addon} where C{obj} is defined. If obj is None the caller code frame is assumed to allow simple retrieval of "current calling addon".
 	@param obj: python object or None for default behaviour.
diff --git a/source/appModuleHandler.py b/source/appModuleHandler.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # A part of NonVisual Desktop Access (NVDA)
 # Copyright (C) 2006-2022 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Patrick Zajda, Joseph Lee,
-# Babbage B.V., Mozilla Corporation, Julien Cochuyt
+# Babbage B.V., Mozilla Corporation, Julien Cochuyt, Leonard de Ruijter
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -563,7 +563,10 @@ def _get_productVersion(self):
 		return self.productVersion
 
 	def __repr__(self):
-		return "<%r (appName %r, process ID %s) at address %x>"%(self.appModuleName,self.appName,self.processID,id(self))
+		return (
+			f"{self.__class__.__name__}"
+			f"({self.appModuleName}, appName={self.appName!r}, processID={self.processID!r})"
+		)
 
 	def _get_appModuleName(self):
 		return self.__class__.__module__.split('.')[-1]
diff --git a/source/braille.py b/source/braille.py
@@ -1,7 +1,8 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2008-2022 NV Access Limited, Joseph Lee, Babbage B.V., Davy Kager, Bram Duvigneau
+# Copyright (C) 2008-2022 NV Access Limited, Joseph Lee, Babbage B.V., Davy Kager, Bram Duvigneau,
+# Leonard de Ruijter
 
 import itertools
 import os
@@ -2498,6 +2499,9 @@ def _get_numCells(self) -> int:
 		"""
 		return 0
 
+	def __repr__(self):
+		return f"{self.__class__.__name__}({self.name!r}, numCells={self.numCells!r})"
+
 	def display(self, cells):
 		"""Display the given braille cells.
 		@param cells: The braille cells to display.
diff --git a/source/driverHandler.py b/source/driverHandler.py
@@ -2,7 +2,7 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2006-2019 NV Access Limited, Leonard de Ruijter
+# Copyright (C) 2006-2022 NV Access Limited, Leonard de Ruijter
 
 """Handler for driver functionality that is global to synthesizers and braille displays."""
 from autoSettingsUtils.autoSettings import AutoSettings
@@ -48,6 +48,9 @@ def terminate(self):
 		self.saveSettings()
 		self._unregisterConfigSaveAction()
 
+	def __repr__(self):
+		return f"{self.__class__.__name__}({self.name!r})"
+
 	@classmethod
 	def check(cls):
 		"""Determine whether this driver is available.
diff --git a/source/globalPluginHandler.py b/source/globalPluginHandler.py
@@ -84,3 +84,7 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 		@param clsList: The list of classes, which will be modified by this method if appropriate.
 		@type clsList: list of L{NVDAObjects.NVDAObject}
 		"""
+
+	def __repr__(self):
+		return f"{self.__class__.__name__} ({self.__class__.__module__!r})"
+
