Respond to review.

manage.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 import os
 import sys
 

milestones/admin.py

@@ -1,8 +1,7 @@
 """
 Admin module for milestones app
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 from django.contrib import admin
 
 from milestones.models import (

milestones/api.py

@@ -12,8 +12,7 @@
 
 Note the terminology difference at this layer vs. Data -- add/edit/get/remove
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 from . import data
 from . import exceptions
 from . import validators

milestones/data.py

@@ -24,8 +24,7 @@
 else:
     import milestones.resources as remote
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import six
 

milestones/exceptions.py

@@ -1,8 +1,7 @@
 """
 Application-specific exception classes used throughout the implementation
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 from django.core.exceptions import ValidationError
 
 

milestones/models.py

@@ -8,12 +8,13 @@
 which leverages Django's signal framework.
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from model_utils.models import TimeStampedModel
 
 
+@python_2_unicode_compatible
 class Milestone(TimeStampedModel):
     """
     A Milestone is a representation of an accomplishment which can be
@@ -33,10 +34,11 @@ class Meta:
         """ Meta class for this Django model """
         unique_together = (("namespace", "name"),)
 
-    def __unicode__(self):
-        return str(self.namespace)
+    def __str__(self):
+        return self.namespace
 
 
+@python_2_unicode_compatible
 class MilestoneRelationshipType(TimeStampedModel):
     """
     A MilestoneRelationshipType represents a category of link available
@@ -62,8 +64,8 @@ class MilestoneRelationshipType(TimeStampedModel):
     description = models.TextField(blank=True)
     active = models.BooleanField(default=True)
 
-    def __unicode__(self):
-        return str(self.name)
+    def __str__(self):
+        return self.name
 
     @classmethod
     # pylint: disable=invalid-name
@@ -76,6 +78,7 @@ def get_supported_milestone_relationship_types(cls):
         return RELATIONSHIP_TYPE_CHOICES
 
 
+@python_2_unicode_compatible
 class CourseMilestone(TimeStampedModel):
     """
     A CourseMilestone represents the link between a Course and a
@@ -95,10 +98,11 @@ class Meta:
         """ Meta class for this Django model """
         unique_together = (("course_id", "milestone"),)
 
-    def __unicode__(self):
-        return str("%s:%s:%s" % (self.course_id, self.milestone_relationship_type, self.milestone))
+    def __str__(self):
+        return "%s:%s:%s" % (self.course_id, self.milestone_relationship_type, self.milestone)
 
 
+@python_2_unicode_compatible
 class CourseContentMilestone(TimeStampedModel):
     """
     A CourseContentMilestone represents the link between a specific
@@ -126,10 +130,11 @@ class Meta:
         """ Meta class for this Django model """
         unique_together = (("course_id", "content_id", "milestone"),)
 
-    def __unicode__(self):
-        return str("%s:%s:%s" % (self.content_id, self.milestone_relationship_type, self.milestone))
+    def __str__(self):
+        return "%s:%s:%s" % (self.content_id, self.milestone_relationship_type, self.milestone)
 
 
+@python_2_unicode_compatible
 class UserMilestone(TimeStampedModel):
     """
     A UserMilestone represents an stage reached or event experienced
@@ -155,5 +160,5 @@ class Meta:
         """ Meta class for this Django model """
         unique_together = ("user_id", "milestone")
 
-    def __unicode__(self):
-        return str("%s:%s" % (self.user_id, self.milestone))
+    def __str__(self):
+        return "%s:%s" % (self.user_id, self.milestone)

milestones/serializers.py

@@ -2,8 +2,7 @@
 Data layer serialization operations.  Converts querysets to simple
 python containers (mainly arrays and dicts).
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 import json
 
 from . import models

milestones/services.py

@@ -2,8 +2,7 @@
 A wrapper class around requested methods exposed in api.py
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 import types
 
 from milestones import api as milestones_api

milestones/tests/test_api.py

@@ -4,8 +4,7 @@
 """
 Milestones API Module Test Cases
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from opaque_keys.edx.keys import UsageKey
 

milestones/tests/test_data.py

@@ -5,8 +5,7 @@
 
 Note: 'Unit Test: ' labels are output to the console during test runs
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 import milestones.api as api
 import milestones.data as data
 import milestones.exceptions as exceptions

milestones/tests/test_services.py

@@ -2,8 +2,7 @@
 Test for the xBlock service
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 import unittest
 import types
 

milestones/tests/utils.py

@@ -2,8 +2,7 @@
 """
 Utility module for Milestones test cases
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 from django.contrib.auth.models import User
 from django.test import TestCase
 from opaque_keys.edx.keys import CourseKey, UsageKey

milestones/validators.py

@@ -1,8 +1,7 @@
 """
 Validators confirm the integrity of inbound information prior to a data.py handoff
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import json
 import six

setup.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 from setuptools import setup, find_packages
 from milestones import __version__ as VERSION