IfParser.next() method renamed to avoid confusion with iterator protocol. (fd6a9d35) · Commits · Dom Sekotill / django

django/template/smartif.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -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