Merge pull request #86 from dragonyanglong/fix_py3_thread

Fix py3 thread

Author: dragonyanglong

CHANGELOG.md

@@ -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()`.

setup.py

@@ -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)

src/diffpy/pdfgui/control/fitting.py

@@ -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"""

src/diffpy/pdfgui/control/pdfguicontrol.py

@@ -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):