diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2014-09-30 01:31:13 -0700 |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2014-09-30 01:31:13 -0700 |
| commit | c4ce6cdd84073572ea167af205e9b8cca8900059 (patch) | |
| tree | adbb421eeed86a0043f10fa6f766b5956c357e0a | |
| parent | 3ab8acc44421655ee73e55aa469271a456e97f84 (diff) | |
| parent | 17a5dfdcd56eb76af731d141de395a7632a905b8 (diff) | |
| download | pystache-development.tar.gz | |
Merge branch 'master' into developmentdevelopment
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | pystache/parser.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a07a55f..0022705 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: python -# Travis CI has no plans to support Python 2.4 and Jython. +# Travis CI has no plans to support Jython and no longer supports Python 2.5. python: - - 2.5 - 2.6 - 2.7 - 3.2 diff --git a/pystache/parser.py b/pystache/parser.py index ae8fc0e..aa7190f 100644 --- a/pystache/parser.py +++ b/pystache/parser.py @@ -43,7 +43,7 @@ def parse(template, delimiters=None): def _compile_template_re(delimiters): """ - Return a regular expresssion object (re.RegexObject) instance. + Return a regular expression object (re.RegexObject) instance. """ # The possible tag type characters following the opening tag, |