From efa470820654c8e6e7dbb32a04ddad80c5401ee2 Mon Sep 17 00:00:00 2001 From: Dominik George <nik@naturalnet.de> Date: Thu, 2 Aug 2018 14:30:11 +0200 Subject: [PATCH] Correctly set default settings. --- django_starfield/defaults.py | 3 --- django_starfield/widgets.py | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 django_starfield/defaults.py diff --git a/django_starfield/defaults.py b/django_starfield/defaults.py deleted file mode 100644 index cef0cba..0000000 --- a/django_starfield/defaults.py +++ /dev/null @@ -1,3 +0,0 @@ -STARFIELD_COLOUR = '#f5b301' -STARFIELD_CODEPOINT = '2605' -STARFIELD_STARS = 5 diff --git a/django_starfield/widgets.py b/django_starfield/widgets.py index 701c54f..04abbf3 100644 --- a/django_starfield/widgets.py +++ b/django_starfield/widgets.py @@ -1,9 +1,9 @@ from django.conf import settings from django.forms.widgets import Widget -from . import defaults - -settings.configure(default_settings=defaults) +STARFIELD_COLOUR = '#f5b301' +STARFIELD_CODEPOINT = '2605' +STARFIELD_STARS = 5 class Stars(Widget): template_name = 'django_starfield/stars.html' @@ -12,17 +12,17 @@ class Stars(Widget): super(Stars, self).__init__(attrs) if stars is None: - self.stars = settings.STARFIELD_STARS + self.stars = getattr(settings, 'STARFIELD_STARS', STARFIELD_STARS) if codepoint is None: - self.codepoint = settings.STARFIELD_CODEPOINT + self.codepoint = getattr(settings, 'STARFIELD_CODEPOINT', STARFIELD_CODEPOINT) if colour is None: - self.colour = settings.STARFIELD_COLOUR + self.colour = getattr(settings, 'STARFIELD_COLOUR', STARFIELD_COLOUR) def get_context(self, name, value, attrs): context = super(Stars, self).get_context(name, value, attrs) context['stars'] = range(self.stars, 0, -1) - if not self.codepoint == defaults.STARFIELD_CODEPOINT: + if not self.codepoint == STARFIELD_CODEPOINT: context['codepoint'] = self.codepoint - if not self.colour == defaults.STARFIELD_COLOUR: + if not self.colour == STARFIELD_COLOUR: contect['colour'] = self.colour return context -- GitLab