From 4c62ddbf733811dc1496645503e8b3fe562a6af0 Mon Sep 17 00:00:00 2001
From: Simon Billinge <simon.billinge@gmail.com>
Date: Wed, 31 Jul 2024 06:22:52 -0400
Subject: [PATCH 1/2] wx12 and bonlengthdialog

---
 src/diffpy/pdfgui/gui/bondlengthdialog.py  | 4 ++--
 src/diffpy/pdfgui/gui/wxextensions/wx12.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/diffpy/pdfgui/gui/bondlengthdialog.py b/src/diffpy/pdfgui/gui/bondlengthdialog.py
index e23ec5c5..7624009a 100644
--- a/src/diffpy/pdfgui/gui/bondlengthdialog.py
+++ b/src/diffpy/pdfgui/gui/bondlengthdialog.py
@@ -219,8 +219,8 @@ def onSpin(self, event):  # wxGlade: BondLengthDialog.<event_handler>
         loop = True
         while loop:
             loop = False
-            for l in letters:
-                if newval == getattr(self, l):
+            for letter in letters:
+                if newval == getattr(self, letter):
                     loop = True
                     if increasing:
                         newval += 1
diff --git a/src/diffpy/pdfgui/gui/wxextensions/wx12.py b/src/diffpy/pdfgui/gui/wxextensions/wx12.py
index 17a3f938..45552de0 100644
--- a/src/diffpy/pdfgui/gui/wxextensions/wx12.py
+++ b/src/diffpy/pdfgui/gui/wxextensions/wx12.py
@@ -46,7 +46,7 @@ def Append(self, *args, **kwargs):
 
 
 if WX4:
-    Menu = wx.Menu
+    Menu = wx.Menu  # noqa: F811
 
 # ----------------------------------------------------------------------------
 
@@ -58,7 +58,7 @@ class ListCtrl(wx.ListCtrl):
 
 
 if WX4:
-    ListCtrl = wx.ListCtrl
+    ListCtrl = wx.ListCtrl  # noqa: F811
 
 # ----------------------------------------------------------------------------
 
@@ -70,7 +70,7 @@ class TreeCtrl(wx.TreeCtrl):
 
 
 if WX4:
-    TreeCtrl = wx.TreeCtrl
+    TreeCtrl = wx.TreeCtrl  # noqa: F811
 
 # wx.ToolBar -----------------------------------------------------------------
 

From 5794ecde152418b109dfc9c15405fbff5a15ca66 Mon Sep 17 00:00:00 2001
From: Simon Billinge <simon.billinge@gmail.com>
Date: Wed, 31 Jul 2024 06:28:39 -0400
Subject: [PATCH 2/2] devutils/makedist import order

---
 devutils/makesdist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devutils/makesdist b/devutils/makesdist
index e77257ea..dccfaa99 100755
--- a/devutils/makesdist
+++ b/devutils/makesdist
@@ -11,11 +11,11 @@ import subprocess
 import sys
 import tarfile
 
+from setup import FALLBACK_VERSION, versiondata
+
 BASEDIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 sys.path.insert(0, BASEDIR)
 
-from setup import FALLBACK_VERSION, versiondata
-
 timestamp = versiondata.getint("DEFAULT", "timestamp")
 
 vfb = versiondata.get("DEFAULT", "version").split(".post")[0] + ".post0"