Skip to content

Commit ecc58f3

Browse files
committed
Update Python 2 .next() to Python 3 next().
`.next()` has been replaced with `next()` in Python 3. Fixed.
1 parent f8cbe5b commit ecc58f3

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

java2python/compiler/template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def altIdent(self, name):
157157
for klass in self.parents(lambda v:v.isClass):
158158
if name in klass.variables:
159159
try:
160-
method = self.parents(lambda v:v.isMethod).next()
160+
method = next(self.parents(lambda v:v.isMethod))
161161
except (StopIteration, ):
162162
return name
163163
if name in [p['name'] for p in method.parameters]:

java2python/compiler/visitor.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ def acceptSwitch(self, node, memo):
540540

541541
def acceptSynchronized(self, node, memo):
542542
""" Accept and process a synchronized statement (not a modifier). """
543-
module = self.parents(lambda x:x.isModule).next()
543+
module = next(self.parents(lambda x:x.isModule))
544544
module.needsSyncHelpers = True
545545
if node.parent.type == tokens.MODIFIER_LIST:
546546
# Skip any synchronized modifier
@@ -700,7 +700,7 @@ def acceptPrePost(self, node, memo):
700700
name = node.firstChildOfType(tokens.IDENT).text
701701
handler = self.configHandler('VariableNaming')
702702
rename = handler(name)
703-
block = self.parents(lambda x:x.isMethod).next()
703+
block = next(self.parents(lambda x:x.isMethod))
704704
if pre:
705705
left = name
706706
else:
@@ -725,7 +725,7 @@ def acceptBitShiftRight(self, node, memo):
725725
self.fs = 'bsr(' + FS.l + ', ' + FS.r + ')'
726726
self.left, self.right = visitors = factory(parent=self), factory()
727727
self.zipWalk(node.children, visitors, memo)
728-
module = self.parents(lambda x:x.isModule).next()
728+
module = next(self.parents(lambda x:x.isModule))
729729
module.needsBsrFunc = True
730730

731731
def acceptBitShiftRightAssign(self, node, memo):
@@ -734,7 +734,7 @@ def acceptBitShiftRightAssign(self, node, memo):
734734
self.fs = FS.l + ' = bsr(' + FS.l + ', ' + FS.r + ')'
735735
self.left, self.right = visitors = factory(parent=self), factory()
736736
self.zipWalk(node.children, visitors, memo)
737-
module = self.parents(lambda x:x.isModule).next()
737+
module = next(self.parents(lambda x:x.isModule))
738738
module.needsBsrFunc = True
739739

740740
def acceptClassConstructorCall(self, node, memo):
@@ -810,12 +810,12 @@ def acceptStaticArrayCreator(self, node, memo):
810810

811811
def acceptSuper(self, node, memo):
812812
""" Accept and process a super expression. """
813-
cls = self.parents(lambda c:c.isClass).next()
813+
cls = next(self.parents(lambda c:c.isClass))
814814
self.right = self.factory.expr(fs='super({name}, self)'.format(name=cls.name))
815815

816816
def acceptSuperConstructorCall(self, node, memo):
817817
""" Accept and process a super constructor call. """
818-
cls = self.parents(lambda c:c.isClass).next()
818+
cls = next(self.parents(lambda c:c.isClass))
819819
fs = 'super(' + FS.l + ', self).__init__(' + FS.r + ')'
820820
self.right = self.factory.expr(fs=fs, left=cls.name)
821821
return self.right

java2python/mod/basic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ def maybeAbstractMethod(method):
129129

130130
def maybeSynchronizedMethod(method):
131131
if 'synchronized' in method.modifiers:
132-
module = method.parents(lambda x:x.isModule).next()
132+
module = next(method.parents(lambda x:x.isModule))
133133
module.needsSyncHelpers = True
134134
yield '@synchronized'
135135

136136

137137
def globalNameCounter(original, counter=count()):
138-
return '__{0}_{1}'.format(original, counter.next())
138+
return '__{0}_{1}'.format(original, next(counter))
139139

140140

141141
def getBsrSrc():

0 commit comments

Comments
 (0)