Move utils into utils

Author: stephenmcd

forms_builder/forms/fields.py

@@ -3,10 +3,10 @@
 from django.core.exceptions import ImproperlyConfigured
 from django import forms
 from django.forms.extras import SelectDateWidget
-from django.utils.importlib import import_module
 from django.utils.translation import ugettext_lazy as _
 
 from forms_builder.forms.settings import USE_HTML5, EXTRA_FIELDS, EXTRA_WIDGETS
+from forms_builder.forms.utils import html5_field, import_attr
 
 
 # Constants for all available field types.
@@ -80,7 +80,6 @@
 MULTIPLE = (CHECKBOX_MULTIPLE, SELECT_MULTIPLE)
 
 # HTML5 Widgets
-html5_field = lambda name, base: type(str(""), (base,), {"input_type": name})
 if USE_HTML5:
     WIDGETS.update({
         DATE: html5_field("date", forms.DateInput),
@@ -96,11 +95,9 @@
     if field_id in CLASSES:
         err = "ID %s for field %s in FORMS_EXTRA_FIELDS already exists"
         raise ImproperlyConfigured(err % (field_id, field_name))
-    module_path, member_name = field_path.rsplit(".", 1)
-    CLASSES[field_id] = getattr(import_module(module_path), member_name)
+    CLASSES[field_id] = import_attr(field_path)
     NAMES += ((field_id, _(field_name)),)
 
 # Add/update custom widgets.
 for field_id, widget_path in EXTRA_WIDGETS:
-    module_path, member_name = widget_path.rsplit(".", 1)
-    WIDGETS[field_id] = getattr(import_module(module_path), member_name)
+    WIDGETS[field_id] = import_attr(widget_path)

forms_builder/forms/utils.py

@@ -2,6 +2,7 @@
 from future.builtins import str
 
 from django.template.defaultfilters import slugify as django_slugify
+from django.utils.importlib import import_module
 from unidecode import unidecode
 
 
@@ -43,3 +44,20 @@ def split_choices(choices_string):
     Convert a comma separated choices string to a list.
     """
     return [x.strip() for x in choices_string.split(",") if x.strip()]
+
+
+def html5_field(name, base):
+    """
+    Takes a Django form field class and returns a subclass of
+    it with the given name as its input type.
+    """
+    return type(str(""), (base,), {"input_type": name})
+
+
+def import_attr(path):
+    """
+    Given a a Python dotted path to a variable in a module,
+    imports the module and returns the variable in it.
+    """
+    module_path, attr_name = path.rsplit(".", 1)
+    return getattr(import_module(module_path), attr_name)