diff options
| author | Hugo <hugovk@users.noreply.github.com> | 2018-01-16 13:23:21 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2018-01-16 13:23:21 -0500 |
| commit | a582879d89ac6e37b9daa8b3c820ebedddad2aea (patch) | |
| tree | c52c26b30292db25cbef0a89021c205dd0ccb44f /test/test_template.py | |
| parent | 200398c6fba989a7f72779e62fd326b28d12cdf2 (diff) | |
| download | mako-a582879d89ac6e37b9daa8b3c820ebedddad2aea.tar.gz | |
Remove redundant Python<2.6 code
Includes PR https://github.com/zzzeek/mako/pull/26 so [Travis CI passes](https://travis-ci.org/hugovk/mako/builds/329346809). The last two commits are unique to this PR.
---
Since Mako 1.0.0, Python 2.6 has been the minimum supported version:
> [general] Compatibility changes; in order to modernize the codebase, Mako is now dropping support for Python 2.4 and Python 2.5 altogether. The source base is now targeted at Python 2.6 and forwards.
http://docs.makotemplates.org/en/latest/changelog.html#change-b602a175c0ec26eaa4f42962d23cca96
This removes redundant code only relevant to Python 2.5 or earlier.
It also adds `python_requires` to setup.py, so pip won't install this version on Python 2.5 or earlier. For people with older versions, pip will install the next Mako version down.
Are all Python 3.x versions supported? If not, I'll add those to `python_requires` as well.
Change-Id: I624e1d56e79555c579278c7a5b4de9498179ffe9
Pull-request: https://github.com/zzzeek/mako/pull/27
Diffstat (limited to 'test/test_template.py')
| -rw-r--r-- | test/test_template.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/test_template.py b/test/test_template.py index 7f21978..1f2d0c1 100644 --- a/test/test_template.py +++ b/test/test_template.py @@ -10,8 +10,7 @@ import os from test.util import flatten_result, result_lines from mako.compat import u from test import TemplateTest, eq_, template_base, module_base, \ - requires_python_26_or_greater, assert_raises, assert_raises_message, \ - requires_python_2 + assert_raises, assert_raises_message, requires_python_2 import unittest class ctx(object): @@ -910,7 +909,6 @@ class ControlTest(TemplateTest): filters=lambda s:s.strip() ) - @requires_python_26_or_greater def test_blank_control_8(self): self._do_memory_test( """ @@ -1009,7 +1007,6 @@ class ControlTest(TemplateTest): filters=lambda s:s.strip() ) - @requires_python_26_or_greater def test_commented_blank_control_8(self): self._do_memory_test( """ |