From 4ab2d7ad97ec56bf822d3de8d2796b6e93f24787 Mon Sep 17 00:00:00 2001 From: Jakub Date: Fri, 3 May 2019 15:33:42 +0200 Subject: [PATCH 1/2] Change iter.next() to next(iter) --- source/eventHandler.py | 2 +- source/gui/settingsDialogs.py | 2 +- source/sayAllHandler.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/eventHandler.py b/source/eventHandler.py index 6f724c293ef..0f02986a4f1 100755 --- a/source/eventHandler.py +++ b/source/eventHandler.py @@ -89,7 +89,7 @@ def __init__(self, eventName, obj, kwargs): self.kwargs = kwargs self._gen = self.gen(eventName, obj) try: - self.next() + next(self) except StopIteration: pass del self._gen diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py index 28e8c7961c5..3ea437a4f63 100644 --- a/source/gui/settingsDialogs.py +++ b/source/gui/settingsDialogs.py @@ -2667,7 +2667,7 @@ def makeSettings(self, settingsSizer): tetherChoices = [x[1] for x in braille.handler.tetherValues] self.tetherList = sHelper.addLabeledControl(tetherListText, wx.Choice, choices=tetherChoices) tetherChoice=braille.handler.TETHER_AUTO if config.conf["braille"]["autoTether"] else config.conf["braille"]["tetherTo"] - selection = (x for x,y in enumerate(braille.handler.tetherValues) if y[0]==tetherChoice).next() + selection = next((x for x,y in enumerate(braille.handler.tetherValues) if y[0]==tetherChoice)) try: self.tetherList.SetSelection(selection) except: diff --git a/source/sayAllHandler.py b/source/sayAllHandler.py index 8870e7f88e5..51f5a8822bc 100644 --- a/source/sayAllHandler.py +++ b/source/sayAllHandler.py @@ -49,7 +49,7 @@ def readObjects(obj): _startGenerator(readObjectsHelper_generator(obj)) def generateObjectSubtreeSpeech(obj,indexGen): - index=indexGen.next() + index=next(indexGen) speech.speakObject(obj,reason=controlTypes.REASON_SAYALL,index=index) yield obj,index child=obj.simpleFirstChild @@ -71,7 +71,7 @@ def readObjectsHelper_generator(obj): if lastReceivedIndex is None or (lastSentIndex-lastReceivedIndex)<=1: if keepReading: try: - o,lastSentIndex=speechGen.next() + o,lastSentIndex=next(speechGen) except StopIteration: keepReading=False continue From 6c7c3bf14f4d2ff18ea4bbd24da69d8a13f08c71 Mon Sep 17 00:00:00 2001 From: Jakub Date: Fri, 3 May 2019 20:35:35 +0200 Subject: [PATCH 2/2] Revert requested changes --- source/eventHandler.py | 2 +- source/sayAllHandler.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/eventHandler.py b/source/eventHandler.py index 0f02986a4f1..6f724c293ef 100755 --- a/source/eventHandler.py +++ b/source/eventHandler.py @@ -89,7 +89,7 @@ def __init__(self, eventName, obj, kwargs): self.kwargs = kwargs self._gen = self.gen(eventName, obj) try: - next(self) + self.next() except StopIteration: pass del self._gen diff --git a/source/sayAllHandler.py b/source/sayAllHandler.py index 51f5a8822bc..8870e7f88e5 100644 --- a/source/sayAllHandler.py +++ b/source/sayAllHandler.py @@ -49,7 +49,7 @@ def readObjects(obj): _startGenerator(readObjectsHelper_generator(obj)) def generateObjectSubtreeSpeech(obj,indexGen): - index=next(indexGen) + index=indexGen.next() speech.speakObject(obj,reason=controlTypes.REASON_SAYALL,index=index) yield obj,index child=obj.simpleFirstChild @@ -71,7 +71,7 @@ def readObjectsHelper_generator(obj): if lastReceivedIndex is None or (lastSentIndex-lastReceivedIndex)<=1: if keepReading: try: - o,lastSentIndex=next(speechGen) + o,lastSentIndex=speechGen.next() except StopIteration: keepReading=False continue