Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ Notable differences from version 1.1.2.

### Changed

- Update wxpython to 4.1.1, and remove incompatible align flags.

### Deprecated

### Removed

### Fixed

- Incompatible conversion between bytes and str from py2 to py3.
- Incompatible conversion between bytes and str from py2 to py3.
- Replace the deprecated `Thread.isAlive()` with `Thread.is_alive()`.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Use this version when git data are not available, like in git zip archive.
# Update when tagging a new release.
FALLBACK_VERSION = '1.4.3'
FALLBACK_VERSION = '1.4.6'

# determine if we run with Python 3.
PY3 = (sys.version_info[0] == 3)
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/fitting.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def isThreadRunning(self):

return: True if running, False otherwise
"""
return self.thread is not None and self.thread.isAlive()
return self.thread is not None and self.thread.is_alive()

def join(self):
"""wait for current fitting to finish"""
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/pdfguicontrol.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def exit(self):
"""exit when program finished
"""
self.close()
if self.queueManager.isAlive():
if self.queueManager.is_alive():
self.queueManager.running = False

def newFitting(self, name, position=None):
Expand Down