Skip to content

wx12 and bonlengthdialog #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbillinge merged 2 commits into from
Jul 31, 2024
Merged

wx12 and bonlengthdialog #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c62ddb
wx12 and bonlengthdialog
sbillinge Jul 31, 2024
5794ecd
devutils/makedist import order
sbillinge Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions devutils/makesdist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/diffpy/pdfgui/gui/bondlengthdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/diffpy/pdfgui/gui/wxextensions/wx12.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def Append(self, *args, **kwargs):


if WX4:
Menu = wx.Menu
Menu = wx.Menu # noqa: F811

# ----------------------------------------------------------------------------

Expand All @@ -58,7 +58,7 @@ class ListCtrl(wx.ListCtrl):


if WX4:
ListCtrl = wx.ListCtrl
ListCtrl = wx.ListCtrl # noqa: F811

# ----------------------------------------------------------------------------

Expand All @@ -70,7 +70,7 @@ class TreeCtrl(wx.TreeCtrl):


if WX4:
TreeCtrl = wx.TreeCtrl
TreeCtrl = wx.TreeCtrl # noqa: F811

# wx.ToolBar -----------------------------------------------------------------

Expand Down