str.rsplit() cannot use kwargs in py2k

We just need to use maxsplit as a positional argument to make everyone happy. cc @Aeyoun Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jun 4, 2015 · 803cbb6 · 803cbb6
1 parent a829e75
commit 803cbb6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/nikola/data/themes/base-jinja/templates/crumbs.tmpl b/nikola/data/themes/base-jinja/templates/crumbs.tmpl
@@ -7,7 +7,7 @@
     {% for link, text in crumbs %}
         {% if text != index_file %}
             {% if link == '#' %}
-                <li>{{ text.rsplit('.html', maxsplit=1)[0] }}</li>
+                <li>{{ text.rsplit('.html', 1)[0] }}</li>
             {% else %}
                 <li><a href="{{ link }}">{{ text }}</a></li>
             {% endif %}

diff --git a/nikola/data/themes/base/templates/crumbs.tmpl b/nikola/data/themes/base/templates/crumbs.tmpl
@@ -7,7 +7,7 @@
     % for link, text in crumbs:
         % if text != index_file:
             % if link == '#':
-                <li>${text.rsplit('.html', maxsplit=1)[0]}</li>
+                <li>${text.rsplit('.html', 1)[0]}</li>
             % else:
                 <li><a href="${link}">${text}</a></li>
             % endif

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -5,3 +5,4 @@ pytest==2.7.1
 pytest-cov==1.8.1
 freezegun==0.3.3
 python-coveralls==2.5.0
+colorama==0.3.3
diff --git a/scripts/jinjify.py b/scripts/jinjify.py
@@ -78,7 +78,7 @@ def jinjify(in_theme, out_theme):
         parent = mappings[child]
 
     with io.open(os.path.join(out_theme, "parent"), "w+", encoding='utf-8') as outf:
-        outf.write(u'{0}\n'.format(parent)
+        outf.write(u'{0}\n'.format(parent))
 
     with io.open(os.path.join(out_theme, "engine"), "w+", encoding='utf-8') as outf:
         outf.write(u"jinja\n")