Support Django 2.0

goinnn · Jan 29, 2018 · 769e3e1 · 769e3e1
1 parent a9ab873
commit 769e3e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,7 @@ env:
   - DJANGO_VERSION='Django>=1.9,<1.10'
   - DJANGO_VERSION='Django>=1.10,<1.11'
   - DJANGO_VERSION='Django>=1.11,<2.0'
+  - DJANGO_VERSION='Django>=2.0,<2.1'
   - DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
 matrix:
   exclude:
@@ -29,8 +30,12 @@ matrix:
       env: DJANGO_VERSION='Django>=1.10,<1.11'
     - python: "2.6"
       env: DJANGO_VERSION='Django>=1.11,<2.0'
+    - python: "2.6"
+      env: DJANGO_VERSION='Django>=2.0,<2.1'
     - python: "2.6"
       env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
+    - python: "2.7"
+      env: DJANGO_VERSION='Django>=2.0,<2.1'
     - python: "2.7"
       env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
     - python: "3.3"
@@ -43,6 +48,8 @@ matrix:
       env: DJANGO_VERSION='Django>=1.10,<1.11'
     - python: "3.3"
       env: DJANGO_VERSION='Django>=1.11,<2.0'
+    - python: "3.3"
+      env: DJANGO_VERSION='Django>=2.0,<2.1'
     - python: "3.3"
       env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
     - python: "3.4"

diff --git a/multiselectfield/db/fields.py b/multiselectfield/db/fields.py
@@ -102,7 +102,10 @@ def get_choices_selected(self, arr_choices):
         return choices_selected
 
     def value_to_string(self, obj):
-        value = self._get_val_from_obj(obj)
+        try:
+            value = self.val_from_object(obj)
+        except AttributeError:
+            value = self._get_val_from_obj(obj)
         return self.get_prep_value(value)
 
     def validate(self, value, model_instance):