p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

IfParser.next() method renamed to avoid confusion with iterator protocol.

This commit is contained in:
Luke Plant 2012-06-14 23:10:51 +01:00
parent edee20ff50
commit fd6a9d35d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/template/smartif.py
View File

@ -165,7 +165,7 @@ class IfParser(object):
self.tokens = mapped_tokens
self.pos = 0
self.current_token = self.next()
self.current_token = self.next_token()
def translate_token(self, token):
try:
@ -175,7 +175,7 @@ class IfParser(object):
else:
return op()
def next(self):
def next_token(self):
if self.pos >= len(self.tokens):
return EndToken
else:
@ -193,11 +193,11 @@ class IfParser(object):
def expression(self, rbp=0):
t = self.current_token
self.current_token = self.next()
self.current_token = self.next_token()
left = t.nud(self)
while rbp < self.current_token.lbp:
t = self.current_token
self.current_token = self.next()
self.current_token = self.next_token()
left = t.led(left, self)
return left