Simple app to add configuration options to a Django project.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

changed STRING to STR

+21 -16
+5
HISTORY.rst
··· 3 3 History 4 4 ------- 5 5 6 + 2.1.1 (2019-09-20) 7 + ++++++++++++++++++ 8 + 9 + * Changed STRING to STR (Thanks to @seik!) 10 + 6 11 2.1.0 (2019-08-29) 7 12 ++++++++++++++++++ 8 13
+2 -2
options/__init__.py
··· 1 1 """Simple app to add configuration options to a Django project.""" 2 - from options.constants import FLOAT, INT, STRING, FILE, TYPE_CHOICES, CONVERTER 2 + from options.constants import FLOAT, INT, STR, FILE, TYPE_CHOICES, CONVERTER 3 3 from options.helpers import get_option_model, get_user_option_model 4 4 5 5 default_app_config = "options.apps.ConfigurationsConfig" ··· 9 9 "get_user_option_model", 10 10 "FLOAT", 11 11 "INT", 12 - "STRING", 12 + "STR", 13 13 "FILE", 14 14 "TYPE_CHOICES", 15 15 "CONVERTER",
+3 -3
options/constants.py
··· 1 1 from django.utils.translation import ugettext_lazy as _ 2 2 3 - FLOAT, INT, STRING, FILE = (0, 1, 2, 3) 3 + FLOAT, INT, STR, FILE = (0, 1, 2, 3) 4 4 TYPE_CHOICES = ( 5 5 (FLOAT, _("Float")), 6 6 (INT, _("Integer")), 7 - (STRING, _("String")), 7 + (STR, _("String")), 8 8 (FILE, _("File")), 9 9 ) 10 - CONVERTER = {INT: int, FLOAT: float, STRING: str, FILE: str} 10 + CONVERTER = {INT: int, FLOAT: float, STR: str, FILE: str}
+2 -2
options/helpers.py
··· 8 8 from django.utils.deconstruct import deconstructible 9 9 from django.utils.text import slugify 10 10 11 - from options.constants import INT, FLOAT, STRING, CONVERTER 11 + from options.constants import INT, FLOAT, STR, CONVERTER 12 12 13 13 14 14 def get_option_model(): ··· 48 48 49 49 def convert_value(value, value_type): 50 50 """Converts the given value to the given type.""" 51 - default_values = {INT: 0, FLOAT: 1.0, STRING: ""} 51 + default_values = {INT: 0, FLOAT: 1.0, STR: ""} 52 52 try: 53 53 option_value = CONVERTER.get(value_type, str)(value) 54 54 except ValueError:
+2 -2
options/models.py
··· 3 3 from django.db import models 4 4 from django.utils.translation import ugettext_lazy as _ 5 5 6 - from options.constants import STRING, TYPE_CHOICES, CONVERTER, FILE 6 + from options.constants import STR, TYPE_CHOICES, CONVERTER, FILE 7 7 from options.helpers import convert_value, UploadToDir 8 8 from options.managers import OptionManager, UserOptionManager 9 9 ··· 21 21 blank=True, 22 22 db_index=True, 23 23 ) 24 - type = models.PositiveIntegerField(choices=TYPE_CHOICES, default=STRING) 24 + type = models.PositiveIntegerField(choices=TYPE_CHOICES, default=STR) 25 25 value = models.CharField( 26 26 null=True, blank=True, default=None, max_length=256, verbose_name=_("value") 27 27 )
+3 -3
tests/factories.py
··· 2 2 from factory import DjangoModelFactory, Faker, post_generation 3 3 from factory.fuzzy import FuzzyText 4 4 5 - from options import STRING 5 + from options import STR 6 6 from options.models import Option, UserOption 7 7 8 8 ··· 30 30 class OptionFactory(DjangoModelFactory): 31 31 name = FuzzyText() 32 32 public_name = FuzzyText() 33 - type = STRING 33 + type = STR 34 34 35 35 class Meta: 36 36 model = Option ··· 39 39 class UserOptionFactory(DjangoModelFactory): 40 40 name = FuzzyText() 41 41 public_name = FuzzyText() 42 - type = STRING 42 + type = STR 43 43 44 44 class Meta: 45 45 model = UserOption
+2 -2
tests/settings.py
··· 30 30 "rest_framework.authentication.SessionAuthentication", 31 31 ) 32 32 } 33 - from options.constants import STRING 33 + from options.constants import STR 34 34 35 35 SIMPLE_OPTIONS_CONFIGURATION = { 36 36 "default_option": { 37 37 "public_name": "Default Option", 38 - "type": STRING, 38 + "type": STR, 39 39 "value": "default", 40 40 } 41 41 }
+2 -2
tests/test_options.py
··· 2 2 from rest_framework import status 3 3 from rest_framework.test import APITestCase 4 4 5 - from options import INT, FLOAT, STRING 5 + from options import INT, FLOAT, STR 6 6 from options.models import Option, UserOption 7 7 from tests.factories import UserFactory, UserOptionFactory, OptionFactory 8 8 ··· 45 45 name = "default_option" 46 46 expected_value = "user default" 47 47 UserOption.objects.create( 48 - name=name, public_name=name, value=expected_value, type=STRING, user=user 48 + name=name, public_name=name, value=expected_value, type=STR, user=user 49 49 ) 50 50 value = UserOption.objects.get_value(name, user=user, default="other") 51 51 self.assertEqual(expected_value, value)