From 6c2ae8ab43b676dab2b750b5a144bbc667425d61 Mon Sep 17 00:00:00 2001 From: Gilles Fabio Date: Wed, 25 Mar 2015 17:34:25 +0100 Subject: [PATCH] Add py3 unicode support. --- separatedvaluesfield/models.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/separatedvaluesfield/models.py b/separatedvaluesfield/models.py index aa96860..449ac12 100644 --- a/separatedvaluesfield/models.py +++ b/separatedvaluesfield/models.py @@ -1,7 +1,10 @@ -from django.forms.fields import MultipleChoiceField +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + from django.core import validators -from django.db import models from django.core import exceptions +from django.db import models +from django.forms.fields import MultipleChoiceField from django.utils.text import capfirst @@ -31,7 +34,7 @@ def validate(self, value, model_instance): # If we have integers, convert them first to be sure we only compare # right types - choices = [unicode(choice) for choice in choices] + choices = ['%s' % choice for choice in choices] for val in value: if val and not val in choices: @@ -58,7 +61,7 @@ def get_db_prep_value(self, value, **kwargs): assert(isinstance(value, list) or isinstance(value, tuple)) - return self.token.join([unicode(s) for s in value]) + return self.token.join(['%s' % s for s in value]) def value_to_string(self, obj): value = self._get_val_from_obj(obj)