Merge pull request #31 from ikseek/master

Fix wrong mixin type for DecimalQuantityFormField

AUTHORS.rst

@@ -8,3 +8,4 @@ Contributors
 * Cornel Vaideanu <cornel.vaideanu@gmail.com>
 * Alex Bhandari <alexbhandari@gmail.com>
 * Jonas Haag <jonas@lophus.org>
+* Igor Kozyrenko <igor@ikseek.com>

CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog
 =========
 
+Version 0.6.1
+=============
+- Fix wrong mixin type for DecimalQuantityFormField (`merge request #31 from ikseek`_)
+
+
 Version 0.6
 ===========
 - Added ``DecimalQuantityField``
@@ -35,4 +40,5 @@ Version 0.4
 .. _Carli* Freudenberg: https://github.com/CarliJoy
 .. _merge request #11 from jonashaag: https://github.com/CarliJoy/django-pint/pull/11
 .. _merge request #5 from cornelv: https://github.com/CarliJoy/django-pint/pull/5
+.. _merge request #31 from ikseek: https://github.com/CarliJoy/django-pint/pull/31
 .. _black: https://github.com/psf/black

src/quantityfield/fields.py

@@ -271,7 +271,7 @@ class BigIntegerQuantityField(QuantityFieldMixin, models.BigIntegerField):
     to_number_type = staticmethod(raise_precision_error_on_imprecise_int)
 
 
-class DecimalQuantityFormField(QuantityFieldMixin, forms.DecimalField):
+class DecimalQuantityFormField(QuantityFormFieldMixin, forms.DecimalField):
     to_number_type = staticmethod(Decimal)
 
 

tests/test_integration.py

@@ -5,7 +5,11 @@
 
 from decimal import Decimal
 
-from quantityfield.fields import IntegerQuantityFormField, QuantityFormField
+from quantityfield.fields import (
+    DecimalQuantityFormField,
+    IntegerQuantityFormField,
+    QuantityFormField,
+)
 from tests.dummyapp.models import (
     BigIntFieldSaveModel,
     DecimalFieldSaveModel,
@@ -39,7 +43,7 @@ class Meta:
 
 
 class DefaultFormDecimal(forms.ModelForm):
-    weight = QuantityFormField(base_units="gram", unit_choices=["ounce", "gram"])
+    weight = DecimalQuantityFormField(base_units="gram", unit_choices=["ounce", "gram"])
 
     class Meta:
         model = DecimalFieldSaveModel