Mercurial > genshi > genshi-test
diff genshi/template/directives.py @ 935:705727288d7e
Merge r1143 from py3k:
add support for python 3 to remaining genshi.template components:
* minor changes to track encoding=None API change in core genshi modules.
* genshi/template/directives:
* slightly odd syntax changes to make the 2to3 .next() fixer pick up *stream.next()
* minor test fix for change in behaviour of division (/) in Python 3.
* genshi/template/loader:
* add 'b' to file modes to ensure it's loaded as bytes in Python 3.
* use not isinstance(s, unicode) instead of isinstance(s, str) since the former is correctly converted by 2to3.
| author | hodgestar |
|---|---|
| date | Fri, 18 Mar 2011 09:17:52 +0000 |
| parents | 2772fa7c10a3 |
| children |
line wrap: on
line diff
--- a/genshi/template/directives.py +++ b/genshi/template/directives.py @@ -622,13 +622,13 @@ if not info: raise TemplateRuntimeError('"when" directives can only be used ' 'inside a "choose" directive', - self.filename, *stream.next()[2][1:]) + self.filename, *(stream.next())[2][1:]) if info[0]: return [] if not self.expr and not info[1]: raise TemplateRuntimeError('either "choose" or "when" directive ' 'must have a test expression', - self.filename, *stream.next()[2][1:]) + self.filename, *(stream.next())[2][1:]) if info[1]: value = info[2] if self.expr: @@ -661,7 +661,7 @@ if not info: raise TemplateRuntimeError('an "otherwise" directive can only be ' 'used inside a "choose" directive', - self.filename, *stream.next()[2][1:]) + self.filename, *(stream.next())[2][1:]) if info[0]: return [] info[0] = True