black and some basic bootstrap classe and macros

Author: jensens

src/yafowil/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__import__("pkg_resources").declare_namespace(__name__)

src/yafowil/bootstrap/__init__.py

@@ -5,32 +5,31 @@
 import os
 
 
-resourcedir = os.path.join(os.path.dirname(__file__), 'resources')
-js = [{
-    'group': 'bootstrap.dependencies',
-    'resource': 'js/bootstrap.js',
-    'order': 20,
-}]
-css = [{
-    'group': 'bootstrap.dependencies',
-    'resource': 'css/bootstrap.css',
-    'order': 10,
-# }, {
-#     'group': 'bootstrap.dependencies',
-#     'resource': 'css/bootstrap-theme.css',
-#     'order': 11,
-}]
+resourcedir = os.path.join(os.path.dirname(__file__), "resources")
+js = [{"group": "bootstrap.dependencies", "resource": "js/bootstrap.js", "order": 20,}]
+css = [
+    {
+        "group": "bootstrap.dependencies",
+        "resource": "css/bootstrap.css",
+        "order": 10,
+        # }, {
+        #     'group': 'bootstrap.dependencies',
+        #     'resource': 'css/bootstrap-theme.css',
+        #     'order': 11,
+    }
+]
 
 
 @entry_point(order=20)
 def register():
-    factory.register_theme('bootstrap', 'yafowil.bootstrap',
-                           resourcedir, js=js, css=css)
+    factory.register_theme(
+        "bootstrap", "yafowil.bootstrap", resourcedir, js=js, css=css
+    )
 
 
 @entry_point(order=20)
 def configure():
     # only configure factory if not suppressed explicit
-    if not os.environ.get('TESTRUN_MARKER'):
+    if not os.environ.get("TESTRUN_MARKER"):
         configure_factory()
         register_macros()

src/yafowil/bootstrap/common.py

@@ -3,97 +3,102 @@
 
 def bs_field_class(widget, data):
     if data.errors:
-        return 'form-group has-error'
-    return 'form-group'
+        return "form-group has-error"
+    return "form-group"
 
 
 def configure_factory():
     # set theme
-    factory.theme = 'bootstrap'
+    factory.theme = "bootstrap"
 
     # common defaults
-    factory.defaults['text.class'] = 'text form-control'
+    factory.defaults["text.class"] = "text form-control"
 
-    factory.defaults['textarea.class'] = 'textarea form-control'
+    factory.defaults["textarea.class"] = "textarea form-control"
 
-    factory.defaults['lines.class'] = 'lines form-control'
+    factory.defaults["lines.class"] = "lines form-control"
 
-    factory.defaults['password.class'] = 'password form-control'
+    factory.defaults["password.class"] = "password form-control"
 
-    factory.defaults['select.class'] = 'select'
-    factory.defaults['select.block_class'] = 'form-control'
-    factory.defaults['select.radio_wrapper_class'] = 'radio'
-    factory.defaults['select.checkbox_wrapper_class'] = 'checkbox'
+    factory.defaults["select.class"] = "select"
+    factory.defaults["select.block_class"] = "form-control"
+    factory.defaults["select.radio_wrapper_class"] = "radio"
+    factory.defaults["select.checkbox_wrapper_class"] = "checkbox"
 
-    factory.defaults['submit.class'] = 'btn btn-primary'
+    factory.defaults["submit.class"] = "btn btn-primary"
+    factory.defaults["button.class"] = "btn btn-primary"
 
-    factory.defaults['email.class'] = 'email form-control'
+    factory.defaults["email.class"] = "email form-control"
 
-    factory.defaults['url.class'] = 'url form-control'
+    factory.defaults["url.class"] = "url form-control"
 
-    factory.defaults['search.class'] = 'search form-control'
+    factory.defaults["search.class"] = "search form-control"
 
-    factory.defaults['number.class'] = 'number form-control'
+    factory.defaults["number.class"] = "number form-control"
 
-    factory.defaults['label.class'] = 'control-label'
+    factory.defaults["label.class"] = "col-form-label"
 
-    factory.defaults['field.class'] = bs_field_class
+    factory.defaults["field.class"] = bs_field_class
 
-    factory.defaults['error.position'] = 'after'
-    factory.defaults['error.tag'] = 'span'
-    factory.defaults['error.class'] = 'help-block'
-    factory.defaults['error.message_class'] = 'text-danger'
+    factory.defaults["error.position"] = "after"
+    factory.defaults["error.tag"] = "span"
+    factory.defaults["error.class"] = "help-block"
+    factory.defaults["error.message_class"] = "text-danger"
 
-    factory.defaults['help.position'] = 'after'
-    factory.defaults['help.tag'] = 'p'
-    factory.defaults['help.class'] = 'help-block'
+    factory.defaults["help.position"] = "after"
+    factory.defaults["help.tag"] = "small"
+    factory.defaults["help.class"] = "form-text text-muted"
 
     # yafowil.widget.array
-    factory.defaults['array.table_class'] = \
-        'table table-condensed'
+    factory.defaults["array.table_class"] = "table table-condensed"
 
     # yafowil.widget.autocomplete
-    factory.defaults['autocomplete.class'] = 'autocomplete form-control'
+    factory.defaults["autocomplete.class"] = "autocomplete form-control"
 
     # yafowil.widget.chosen
-    factory.defaults['chosen.class'] = 'chosen form-control'
+    factory.defaults["chosen.class"] = "chosen form-control"
 
     # yafowil.widget.datetime
-    factory.defaults['datetime.datepicker_class'] = 'datepicker form-control'
-    factory.defaults['datetime.timepicker_class'] = 'timepicker form-control'
-    factory.defaults['time.timepicker_class'] = 'timepicker form-control'
+    factory.defaults["datetime.datepicker_class"] = "datepicker form-control"
+    factory.defaults["datetime.timepicker_class"] = "timepicker form-control"
+    factory.defaults["time.timepicker_class"] = "timepicker form-control"
 
     # yafowil.widget.dict
-    factory.defaults['dict.table_class'] = \
-        'dictwidget table table-condensed'
-    factory.defaults['dict.key_class'] = 'form-control'
-    factory.defaults['dict.value_class'] = 'form-control'
+    factory.defaults["dict.table_class"] = "dictwidget table table-condensed"
+    factory.defaults["dict.key_class"] = "form-control"
+    factory.defaults["dict.value_class"] = "form-control"
 
     # yafowil.widget.wysihtml5
-    factory.defaults['wysihtml5.class'] = 'wysihtml5 form-control'
+    factory.defaults["wysihtml5.class"] = "wysihtml5 form-control"
 
 
 def register_macros():
     # common
-    factory.register_macro('form', 'form', {
-        'form.class': 'form-horizontal',
-    })
-    factory.register_macro('field', 'field:label:div:help:error', {
-        'label.class_add': 'col-sm-2',
-        'div.class_add': 'col-sm-10',
-    })
-    factory.register_macro('button', 'button', {
-        'button.class': 'btn',
-        'button.class_add': 'btn-primary',
-    })
+    factory.register_macro("form", "form", {})
+
+    factory.register_macro(
+        "field", "field:label:help:error", {}
+    )
+
+    factory.register_macro(
+        "button",
+        "button",
+        {
+            "button.class": "btn",
+            "button.class_add": "btn-primary",
+        },
+    )
 
     # yafowil.widget.array
-    factory.register_macro('array', 'field:label:help:error:array', {
-        'array.label': ' ',
-        'field.class': bs_field_class,
-        'label.class_add': 'col-sm-2',
-        'array.class_add': 'col-sm-10',
-        'help.class_add': 'col-sm-offset-2 col-sm-10',
-        'error.class_add': 'col-sm-offset-2 col-sm-10',
-    })
-    factory.register_macro('arrayfield', 'field:label:help:error', {})
+    factory.register_macro(
+        "array",
+        "field:label:help:error:array",
+        {
+            "array.label": " ",
+            "label.class_add": "col-sm-2",
+            "array.class_add": "col-sm-10",
+            "help.class_add": "col-sm-offset-2 col-sm-10",
+            "error.class_add": "col-sm-offset-2 col-sm-10",
+        },
+    )
+    factory.register_macro("arrayfield", "field:label:help:error", {})

src/yafowil/bootstrap/tests.py

@@ -5,26 +5,27 @@
 import unittest
 
 
-optionflags = doctest.NORMALIZE_WHITESPACE | \
-              doctest.ELLIPSIS | \
-              doctest.REPORT_ONLY_FIRST_FAILURE
+optionflags = (
+    doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS | doctest.REPORT_ONLY_FIRST_FAILURE
+)
 
 TESTFILES = [
-    'common.rst',
+    "common.rst",
 ]
 
 
 def test_suite():
-    return unittest.TestSuite([
-        doctest.DocFileSuite(
-            file, 
-            optionflags=optionflags,
-            globs={'interact': interact,
-                   'pprint': pprint,
-                   'pxml': pxml},
-        ) for file in TESTFILES
-    ])
+    return unittest.TestSuite(
+        [
+            doctest.DocFileSuite(
+                file,
+                optionflags=optionflags,
+                globs={"interact": interact, "pprint": pprint, "pxml": pxml},
+            )
+            for file in TESTFILES
+        ]
+    )
 
 
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')                  #pragma NO COVER
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")  # pragma NO COVER