remove last few uses of "unicode"

This commit is contained in:
Stefan Wojcik 2016-12-06 16:17:15 -05:00
parent 548c7438b0
commit 59cac2b75c

View File

@ -344,13 +344,13 @@ class DecimalField(BaseField):
if value is None: if value is None:
return value return value
if self.force_string: if self.force_string:
return unicode(value) return six.text_type(value)
return float(self.to_python(value)) return float(self.to_python(value))
def validate(self, value): def validate(self, value):
if not isinstance(value, decimal.Decimal): if not isinstance(value, decimal.Decimal):
if not isinstance(value, basestring): if not isinstance(value, basestring):
value = unicode(value) value = six.text_type(value)
try: try:
value = decimal.Decimal(value) value = decimal.Decimal(value)
except Exception as exc: except Exception as exc:
@ -1867,7 +1867,7 @@ class UUIDField(BaseField):
original_value = value original_value = value
try: try:
if not isinstance(value, basestring): if not isinstance(value, basestring):
value = unicode(value) value = six.text_type(value)
return uuid.UUID(value) return uuid.UUID(value)
except Exception: except Exception:
return original_value return original_value
@ -1875,7 +1875,7 @@ class UUIDField(BaseField):
def to_mongo(self, value): def to_mongo(self, value):
if not self._binary: if not self._binary:
return unicode(value) return six.text_type(value)
elif isinstance(value, basestring): elif isinstance(value, basestring):
return uuid.UUID(value) return uuid.UUID(value)
return value return value