From cd3de22068c38409300a578d229cd2fc8d8742e5 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 30 Jul 2018 21:35:03 -0700 Subject: [PATCH] Merge pull request #946 from RobinD42/throbber-issue924 Ensure the sequence attribute is a list by default (cherry picked from commit c706dfacd9fc40d14afde53a05486068de36d167) --- CHANGES.rst | 3 +++ demo/Throbber.py | 5 +---- wx/lib/throbber.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7ed8fc48..1d8f165f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -84,6 +84,9 @@ Changes in this release include the following: * Improve calltip stability in pyshell. (#941) +* Fix TypeError in wx.lib.throbber. (#924) + + 4.0.3 "The show must go on. (Die show-stoppers! Die!)" diff --git a/demo/Throbber.py b/demo/Throbber.py index ee80dae4..c3389a5a 100644 --- a/demo/Throbber.py +++ b/demo/Throbber.py @@ -46,10 +46,7 @@ class TestPanel(wx.Panel): throb.Throbber(self, -1, images, frameDelay = 0.1, reverse = True) seq = self.throbbers['autoreverse']['throbber'].sequence - if isinstance(seq, range): - seq = list(seq).append(0) - else: - seq.append(0) + seq.append(0) self.throbbers['label']['throbber'] = \ throb.Throbber(self, -1, images, frameDelay = 0.1, label = 'Label') diff --git a/wx/lib/throbber.py b/wx/lib/throbber.py index e8985332..f74873f7 100644 --- a/wx/lib/throbber.py +++ b/wx/lib/throbber.py @@ -333,7 +333,7 @@ class Throbber(wx.Panel): #FIXME: need to make sure values are within range!!! self.sequence = sequence else: - self.sequence = range(self.frames) + self.sequence = list(range(self.frames)) if running: self.Start()