From 65d651d3afe2f36ccdb015e67eb97d72b2d7fc36 Mon Sep 17 00:00:00 2001
From: andrei <b1naryth1ef@gmail.com>
Date: Mon, 16 Apr 2018 14:52:47 -0700
Subject: [PATCH] Fix bug related to `text` field

Previously under python 2.x the text field allowed through values which
would not be turned into a string. This is invalid as all output should
be a valid textual string. This commit fixes that behavior to properly
cast the value to a string in all cases.
---
 disco/types/base.py |  4 +---
 tests/types/base.py | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/disco/types/base.py b/disco/types/base.py
index bacfe26..7e2bc95 100644
--- a/disco/types/base.py
+++ b/disco/types/base.py
@@ -224,9 +224,7 @@ def text(obj):
     if six.PY2:
         if isinstance(obj, str):
             return obj.decode('utf-8')
-        return obj
-    else:
-        return str(obj)
+    return six.text_type(obj)
 
 
 def with_equality(field):
diff --git a/tests/types/base.py b/tests/types/base.py
index b22244e..1dbfc2d 100644
--- a/tests/types/base.py
+++ b/tests/types/base.py
@@ -1,6 +1,6 @@
 import pytest
 
-from disco.types.base import Model, Field, cached_property
+from disco.types.base import Model, Field, cached_property, text
 
 
 @pytest.fixture
@@ -39,3 +39,14 @@ def test_defaults():
     model = TestModel()
     assert model.a is None
     assert model.b == 0
+
+
+def test_text_casting():
+    class TestModel(Model):
+        a = Field(text)
+
+    model = TestModel({'a': 1})
+    assert model.a == '1'
+
+    model = TestModel({'a': {}})
+    assert model.a == '{}'