Fix up of: NVDA logging: add originating thread to log entry (nvaccess#10259)

JulienCochuyt · JulienCochuyt · commit 0167e5956d28 · 2019-09-23T12:37:08.000+02:00
`__module__` is `None` for functions defined in the Python console.
diff --git a/source/gui/__init__.py b/source/gui/__init__.py
@@ -894,10 +894,11 @@ def __init__(self, func, *args, **kwargs):
 		self.kwargs = kwargs
 		if hasattr(func, "__qualname__"):  # _FuncPtr doesn't have this
 			if hasattr(func, "__func__"):
-				fname = func.__func__.__module__
+				fname = func.__func__.__module__ or ""
 			else:
-				fname = func.__module__
-			fname += f".{func.__qualname__}"
+				fname = func.__module__ or ""
+			# For functions defined in the Python console, L{__module__} is L{None}
+			fname += f"{'.' if fname else ''}{func.__qualname__}"
 		else:
 			fname = repr(func)
 		super().__init__(name=f"{self.__class__.__module__}.{self.__class__.__qualname__}({fname})")
diff --git a/source/watchdog.py b/source/watchdog.py
@@ -259,10 +259,11 @@ def __init__(self):
 	def execute(self, func, *args, pumpMessages=True, **kwargs):
 		if hasattr(func, "__qualname__"):  # _FuncPtr doesn't have this
 			if hasattr(func, "__func__"):
-				fname = func.__func__.__module__
+				fname = func.__func__.__module__ or ""
 			else:
-				fname = func.__module__
-			fname += f".{func.__qualname__}"
+				fname = func.__module__ or ""
+			# For functions defined in the Python console, L{__module__} is L{None}
+			fname += f"{'.' if fname else ''}{func.__qualname__}"
 		else:
 			fname = repr(func)
 		self.name = f"{self.__class__.__module__}.{self.execute.__qualname__}({fname})"
