From 877ef5c9edf416545312b37b3a92e9ddee88b2b2 Mon Sep 17 00:00:00 2001
From: Steven Cummings <estebistec@gmail.com>
Date: Sun, 29 Dec 2013 12:34:14 -0600
Subject: [PATCH] Tweaks for compat with Python 2.6 and Python 3.X

---
 rest_framework/compound_fields.py            |  4 ++--
 rest_framework/tests/test_compound_fields.py | 24 +++++++-------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/rest_framework/compound_fields.py b/rest_framework/compound_fields.py
index 1766ccae9..9084464f4 100644
--- a/rest_framework/compound_fields.py
+++ b/rest_framework/compound_fields.py
@@ -76,7 +76,7 @@ class DictField(WritableField):
     def to_native(self, obj):
         if self.value_field and obj:
             return dict(
-                (unicode(key, **self.unicode_options), self.value_field.to_native(value))
+                (six.text_type(key, **self.unicode_options), self.value_field.to_native(value))
                 for key, value in obj.items()
             )
         return obj
@@ -84,7 +84,7 @@ class DictField(WritableField):
     def from_native(self, data):
         if self.value_field and data:
             return dict(
-                (unicode(key, **self.unicode_options), self.value_field.from_native(value))
+                (six.text_type(key, **self.unicode_options), self.value_field.from_native(value))
                 for key, value in data.items()
             )
         return data
diff --git a/rest_framework/tests/test_compound_fields.py b/rest_framework/tests/test_compound_fields.py
index 606abc779..c069c12a1 100644
--- a/rest_framework/tests/test_compound_fields.py
+++ b/rest_framework/tests/test_compound_fields.py
@@ -68,16 +68,14 @@ class ListFieldTests(unittest.TestCase):
         (None) value.
         """
         field = ListField()
-        with self.assertRaises(ValidationError):
-            field.validate(None)
+        self.assertRaises(ValidationError, field.validate, None)
 
     def test_validate_non_list(self):
         """
         When a ListField is given a non-list value, then validate will raise a ValidationError.
         """
         field = ListField()
-        with self.assertRaises(ValidationError):
-            field.validate('notAList')
+        self.assertRaises(ValidationError, field.validate, 'notAList')
 
     def test_validate_empty_list(self):
         """
@@ -85,8 +83,7 @@ class ListFieldTests(unittest.TestCase):
         value.
         """
         field = ListField()
-        with self.assertRaises(ValidationError):
-            field.validate([])
+        self.assertRaises(ValidationError, field.validate, [])
 
     def test_validate_elements_valid(self):
         """
@@ -105,8 +102,7 @@ class ListFieldTests(unittest.TestCase):
         then validate will raise a ValidationError.
         """
         field = ListField(CharField(max_length=5))
-        with self.assertRaises(ValidationError):
-            field.validate(["012345", "012345"])
+        self.assertRaises(ValidationError, field.validate, ["012345", "012345"])
 
 
 class DictFieldTests(unittest.TestCase):
@@ -162,16 +158,14 @@ class DictFieldTests(unittest.TestCase):
         (None) value.
         """
         field = DictField()
-        with self.assertRaises(ValidationError):
-            field.validate(None)
+        self.assertRaises(ValidationError, field.validate, None)
 
     def test_validate_non_dict(self):
         """
         When a DictField is given a non-dict value, then validate will raise a ValidationError.
         """
         field = DictField()
-        with self.assertRaises(ValidationError):
-            field.validate('notADict')
+        self.assertRaises(ValidationError, field.validate, 'notADict')
 
     def test_validate_empty_dict(self):
         """
@@ -179,8 +173,7 @@ class DictFieldTests(unittest.TestCase):
         value.
         """
         field = DictField()
-        with self.assertRaises(ValidationError):
-            field.validate({})
+        self.assertRaises(ValidationError, field.validate, {})
 
     def test_validate_elements_valid(self):
         """
@@ -199,5 +192,4 @@ class DictFieldTests(unittest.TestCase):
         then validate will raise a ValidationError.
         """
         field = DictField(CharField(max_length=5))
-        with self.assertRaises(ValidationError):
-            field.validate({"a": "012345", "b": "012345"})
+        self.assertRaises(ValidationError, field.validate, {"a": "012345", "b": "012345"})