diff --git a/wxPython/demo/Throbber.py b/wxPython/demo/Throbber.py index b80c776235..84725cef8f 100644 --- a/wxPython/demo/Throbber.py +++ b/wxPython/demo/Throbber.py @@ -118,7 +118,7 @@ class TestPanel(wxPanel): sizer.SetSizeHints(self) sizer.Fit(self) - for t in self.throbbers: + for t in self.throbbers.keys(): self.throbbers[t]['throbber'].Start() self.otherThrobber.Start() self.otherThrobber.Reverse() @@ -130,11 +130,11 @@ class TestPanel(wxPanel): event.Skip() def OnStartAnimation(self, event): - for t in self.throbbers: + for t in self.throbbers.keys(): self.throbbers[t]['throbber'].Start() def OnStopAnimation(self, event): - for t in self.throbbers: + for t in self.throbbers.keys(): self.throbbers[t]['throbber'].Rest() def OnClickThrobber(self, event): diff --git a/wxPython/wxPython/lib/popupctl.py b/wxPython/wxPython/lib/popupctl.py index fe4408a9b3..34568d65d8 100644 --- a/wxPython/wxPython/lib/popupctl.py +++ b/wxPython/wxPython/lib/popupctl.py @@ -185,7 +185,7 @@ class wxPopupDialog(wxDialog): class wxPopupControl(wxPyControl): def __init__(self,*_args,**_kwargs): - if 'value' in _kwargs: + if _kwargs.has_key('value'): del _kwargs['value'] apply(wxPyControl.__init__,(self,) + _args,_kwargs)