Merge 584aafb into 438f06f

seanbudd · web-flow · commit 76b6d92cc071 · 2021-11-01T12:02:55.000+10:00
diff --git a/source/gui/__init__.py b/source/gui/__init__.py
@@ -59,15 +59,10 @@
 mainFrame = None
 
 if version_year < 2022:
-	def __getattr__(name):
-		if name == "isInMessageBox":
-			log.warning(
-				"gui.isInMessageBox is deprecated and will be removed in 2022.1."
-				"Consult the changes for developers in 2022.1 for advice on alternatives."
-			)
-			return _isInMessageBox()
-		raise AttributeError(f"module {__name__} has no attribute {name}")
-
+	# Like other module level constants, this must be used as follows (#13011):
+	# import gui; doSomething(gui.isInMessageBox)
+	# from gui import isInMessageBox; doSomething(isInMessageBox)
+	isInMessageBox = False
 
 class MainFrame(wx.Frame):
 
diff --git a/source/gui/message.py b/source/gui/message.py
@@ -5,6 +5,7 @@
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
+from buildVersion import version_year
 import threading
 from typing import Optional
 import wx
@@ -33,9 +34,12 @@ def messageBox(
 	@return: Same as for wx.MessageBox.
 	"""
 	from gui import mainFrame
+	import gui
 	global _messageBoxCounter
 	with _messageBoxCounterLock:
 		_messageBoxCounter += 1
+	if version_year < 2022:
+		gui.isInMessageBox = True
 	try:
 		if not parent:
 			mainFrame.prePopup()
@@ -45,4 +49,6 @@ def messageBox(
 	finally:
 		with _messageBoxCounterLock:
 			_messageBoxCounter -= 1
+		if version_year < 2022:
+			gui.isInMessageBox = isInMessageBox()
 	return res
