Initial approach for parametrization

Author: Dmitry Dygalo

Makefile

@@ -5,4 +5,4 @@ develop:
 	pip install -q -e .
 
 test: develop
-	python runtests.py
+	DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings py.test crispy_forms/tests --cov=crispy_forms

crispy_forms/layout.py

@@ -3,7 +3,7 @@
 from django.utils.html import conditional_escape
 
 from crispy_forms.compatibility import string_types, text_type
-from crispy_forms.utils import render_field, flatatt, TEMPLATE_PACK
+from crispy_forms.utils import render_field, flatatt, TEMPLATE_PACK, get_template_pack
 
 
 class LayoutObject(object):
@@ -197,7 +197,7 @@ class Submit(BaseInput):
     input_type = 'submit'
 
     def __init__(self, *args, **kwargs):
-        self.field_classes = 'submit submitButton' if TEMPLATE_PACK == 'uni_form' else 'btn btn-primary'
+        self.field_classes = 'submit submitButton' if get_template_pack() == 'uni_form' else 'btn btn-primary'
         super(Submit, self).__init__(*args, **kwargs)
 
 
@@ -212,7 +212,7 @@ class Button(BaseInput):
     input_type = 'button'
 
     def __init__(self, *args, **kwargs):
-        self.field_classes = 'button' if TEMPLATE_PACK == 'uni_form' else 'btn'
+        self.field_classes = 'button' if get_template_pack() == 'uni_form' else 'btn'
         super(Button, self).__init__(*args, **kwargs)
 
 
@@ -235,7 +235,7 @@ class Reset(BaseInput):
     input_type = 'reset'
 
     def __init__(self, *args, **kwargs):
-        self.field_classes = 'reset resetButton' if TEMPLATE_PACK == 'uni_form' else 'btn btn-inverse'
+        self.field_classes = 'reset resetButton' if get_template_pack() == 'uni_form' else 'btn btn-inverse'
         super(Reset, self).__init__(*args, **kwargs)
 
 
@@ -355,7 +355,7 @@ class Row(Div):
     """
 
     def __init__(self, *args, **kwargs):
-        self.css_class = 'formRow' if TEMPLATE_PACK == 'uni_form' else 'row'
+        self.css_class = 'formRow' if get_template_pack() == 'uni_form' else 'row'
         super(Row, self).__init__(*args, **kwargs)
 
 

crispy_forms/templatetags/crispy_forms_field.py

@@ -8,7 +8,7 @@
 from django.template import loader, Context
 from django.conf import settings
 
-from crispy_forms.utils import TEMPLATE_PACK
+from crispy_forms.utils import TEMPLATE_PACK, get_template_pack
 
 register = template.Library()
 
@@ -173,7 +173,7 @@ def crispy_addon(field, append="", prepend="", form_show_labels=True):
             'form_show_errors': True,
             'form_show_labels': form_show_labels,
         })
-        template = loader.get_template('%s/layout/prepended_appended_text.html' % TEMPLATE_PACK)
+        template = loader.get_template('%s/layout/prepended_appended_text.html' % get_template_pack())
         context['crispy_prepended_text'] = prepend
         context['crispy_appended_text'] = append
 

crispy_forms/templatetags/crispy_forms_tags.py

@@ -15,7 +15,7 @@
 # We import the filters, so they are available when doing load crispy_forms_tags
 from crispy_forms.templatetags.crispy_forms_filters import *
 
-from crispy_forms.utils import TEMPLATE_PACK
+from crispy_forms.utils import TEMPLATE_PACK, get_template_pack
 
 
 class ForLoopSimulator(object):
@@ -76,13 +76,13 @@ class BasicNode(template.Node):
     both the form object and parses out the helper string into attributes
     that templates can easily handle.
     """
-    def __init__(self, form, helper, template_pack=TEMPLATE_PACK):
+    def __init__(self, form, helper, template_pack=None):
         self.form = form
         if helper is not None:
             self.helper = helper
         else:
             self.helper = None
-        self.template_pack = template_pack
+        self.template_pack = template_pack or get_template_pack()
 
     def get_render(self, context):
         """
@@ -249,7 +249,7 @@ def do_uni_form(parser, token):
     form = token.pop(1)
 
     helper = None
-    template_pack = "'%s'" % TEMPLATE_PACK
+    template_pack = "'%s'" % get_template_pack()
 
     # {% crispy form helper %}
     try:

crispy_forms/tests/conftest.py

@@ -1,19 +1,12 @@
 # coding: utf-8
-from django.conf import settings
-
 import pytest
 
 from crispy_forms.layout import Layout, Div, Field, Submit, Fieldset, HTML
 
 
-def get_skip_mark(*template_packs):
-    return pytest.mark.skipif(settings.CRISPY_TEMPLATE_PACK not in template_packs,
-                              reason='Requires %s template pack' % ' or '.join(template_packs))
-
-
-only_uni_form = get_skip_mark('uni_form')
-only_bootstrap = get_skip_mark('bootstrap', 'bootstrap3')
-only_bootstrap3 = get_skip_mark('bootstrap3')
+only_uni_form = pytest.mark.only('uni_form')
+only_bootstrap = pytest.mark.only('bootstrap', 'bootstrap3')
+only_bootstrap3 = pytest.mark.only('bootstrap3')
 
 
 @pytest.fixture
@@ -34,3 +27,16 @@ def advanced_layout():
         ),
         'last_name',
     )
+
+
+@pytest.fixture(autouse=True, params=('uni_form', 'bootstrap', 'bootstrap3'))
+def template_packs(request, settings):
+    check_template_pack(request._pyfuncitem._obj, request.param)
+    settings.CRISPY_TEMPLATE_PACK = request.param
+
+
+def check_template_pack(function, template_pack):
+    if hasattr(function, 'only'):
+        mark = function.only
+        if template_pack not in mark.args:
+            pytest.skip('Requires %s template pack' % ' or '.join(mark.args))

crispy_forms/tests/test_settings.py

@@ -48,5 +48,4 @@ def __contains__(self, search):
 
 TEMPLATE_DEBUG = True
 TEMPLATE_STRING_IF_INVALID = InvalidVarException()
-CRISPY_TEMPLATE_PACK = os.environ['CRISPY_TEMPLATE_PACK']
 TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'templates'), )

crispy_forms/utils.py

@@ -12,7 +12,11 @@
 from .compatibility import text_type, PY2, memoize, SimpleLazyObject
 
 
-TEMPLATE_PACK = SimpleLazyObject(lambda: getattr(settings, 'CRISPY_TEMPLATE_PACK', 'bootstrap'))
+def get_template_pack():
+    return getattr(settings, 'CRISPY_TEMPLATE_PACK', 'bootstrap')
+
+
+TEMPLATE_PACK = SimpleLazyObject(get_template_pack)
 
 
 # By memoizeing we avoid loading the template every time render_field