Remove Python 2 code, clean up string concats, check other PR comments

Author: dyve

CONTRIBUTING.rst

@@ -74,14 +74,15 @@ Ready to contribute? Here's how to set up `django-bootstrap3` for local developm
 
 Now you can make your changes locally.
 
-5. When you're done making changes, check that your changes pass flake8 and the
-tests, including testing other Python versions with tox::
+5. When you're done making changes, apply reformat and check that your changes pass the tests::
 
-    $ flake8 bootstrap3 tests
-    $ python setup.py test
-    $ tox
+    $ make reformat
+    $ make test
+    $ make tox
 
-To get flake8 and tox, just pip install them into your virtualenv. 
+See which commands are being run in Makefile. Note that `make test` runs on your local environment, and that `make tox` runs a separate virtualenv for all supported configurations.
+
+The packages required for development are in `requirements.txt`.
 
 6. Commit your changes and push your branch to GitHub::
 

bootstrap3/components.py

@@ -26,7 +26,7 @@ def render_alert(content, alert_type=None, dismissable=True):
     css_classes = ["alert", "alert-" + text_value(alert_type)]
     if dismissable:
         css_classes.append("alert-dismissable")
-        button = '<button type="button" class="close" ' + 'data-dismiss="alert" aria-hidden="true">&times;</button>'
+        button = '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>'
     button_placeholder = "__BUTTON__"
     return mark_safe(
         render_tag(

bootstrap3/forms.py

@@ -106,12 +106,13 @@ def render_button(
     elif size == "md" or size == "medium":
         pass
     elif size:
-        raise BootstrapError('Parameter "size" should be "xs", "sm", "lg" or ' + 'empty ("{}" given).'.format(size))
+        raise BootstrapError('Parameter "size" should be "xs", "sm", "lg" or empty ("{}" given).'.format(size))
     if button_type:
         if button_type not in ("submit", "reset", "button", "link"):
             raise BootstrapError(
-                'Parameter "button_type" should be "submit", "reset", '
-                + '"button", "link" or empty  ("{}" given).'.format(button_type)
+                'Parameter "button_type" should be "submit", "reset", "button", "link" or empty  ("{}" given).'.format(
+                    button_type
+                )
             )
         attrs["type"] = button_type
     classes = add_css_class(classes, extra_classes)

bootstrap3/renderers.py

@@ -96,7 +96,7 @@ def __init__(self, formset, *args, **kwargs):
         if not isinstance(formset, BaseFormSet):
             raise BootstrapError('Parameter "formset" should contain a valid Django Formset.')
         self.formset = formset
-        super(FormsetRenderer, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def render_management_form(self):
         return text_value(self.formset.management_form)
@@ -150,7 +150,7 @@ def __init__(self, form, *args, **kwargs):
         if not isinstance(form, BaseForm):
             raise BootstrapError('Parameter "form" should contain a valid Django Form.')
         self.form = form
-        super(FormRenderer, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.error_types = kwargs.get("error_types", "non_field_errors")
         self.error_css_class = kwargs.get("error_css_class", None)
         self.required_css_class = kwargs.get("required_css_class", None)
@@ -222,7 +222,7 @@ def __init__(self, field, *args, **kwargs):
         if not isinstance(field, BoundField):
             raise BootstrapError('Parameter "field" should contain a valid Django BoundField.')
         self.field = field
-        super(FieldRenderer, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.widget = field.field.widget
         self.is_multi_widget = isinstance(field.field.widget, MultiWidget)
@@ -508,7 +508,7 @@ def add_error_attrs(self):
         self.widget.attrs["title"] = field_title.strip()
 
     def add_widget_attrs(self):
-        super(InlineFieldRenderer, self).add_widget_attrs()
+        super().add_widget_attrs()
         self.add_error_attrs()
 
     def append_to_field(self, html):

bootstrap3/tests.py

@@ -32,7 +32,7 @@ class SmallTestForm(forms.Form):
     )
 
     def clean(self):
-        cleaned_data = super(SmallTestForm, self).clean()
+        cleaned_data = super().clean()
         raise forms.ValidationError("This error was added to show the non field errors styling.")
         return cleaned_data
 
@@ -84,7 +84,7 @@ class TestForm(forms.Form):
     use_required_attribute = False
 
     def clean(self):
-        cleaned_data = super(TestForm, self).clean()
+        cleaned_data = super().clean()
         raise forms.ValidationError("This error was added to show the non field errors styling.")
         return cleaned_data
 
@@ -659,7 +659,7 @@ def test_button(self):
         res = render_template_with_form("{% bootstrap_button 'button' size='lg' href='#' %}")
         self.assertIn(
             res.strip(),
-            '<a class="btn btn-default btn-lg" href="#">button</a><a href="#" ' + 'class="btn btn-lg">button</a>',
+            '<a class="btn btn-default btn-lg" href="#">button</a><a href="#" class="btn btn-lg">button</a>',
         )
 
 

demo/demo/forms.py

@@ -18,10 +18,10 @@ class ContactForm(TestForm):
 
 class ContactBaseFormSet(BaseFormSet):
     def add_fields(self, form, index):
-        super(ContactBaseFormSet, self).add_fields(form, index)
+        super().add_fields(form, index)
 
     def clean(self):
-        super(ContactBaseFormSet, self).clean()
+        super().clean()
         raise forms.ValidationError("This error was added to show the non form errors styling")
 
 
@@ -42,6 +42,6 @@ class ArticleForm(forms.Form):
     pub_date = forms.DateField()
 
     def clean(self):
-        cleaned_data = super(ArticleForm, self).clean()
+        cleaned_data = super().clean()
         raise forms.ValidationError("This error was added to show the non field errors styling.")
         return cleaned_data

demo/demo/views.py

@@ -20,7 +20,7 @@ class HomePageView(TemplateView):
     template_name = "demo/home.html"
 
     def get_context_data(self, **kwargs):
-        context = super(HomePageView, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         messages.info(self.request, "hello http://example.com")
         return context
 
@@ -55,7 +55,7 @@ class FormWithFilesView(FormView):
     form_class = FilesForm
 
     def get_context_data(self, **kwargs):
-        context = super(FormWithFilesView, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context["layout"] = self.request.GET.get("layout", "vertical")
         return context
 
@@ -67,7 +67,7 @@ class PaginationView(TemplateView):
     template_name = "demo/pagination.html"
 
     def get_context_data(self, **kwargs):
-        context = super(PaginationView, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         lines = []
         for i in range(200):
             lines.append("Line %s" % (i + 1))