Merge pull request #75 from btomtom5/develop

Changed __unicode__ to __str__
DistrictDataLabs · Jun 5, 2016 · 111eaf8 · 111eaf8
2 parents fe66874 + dfebda2
commit 111eaf8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/account/apps.py b/account/apps.py
@@ -26,6 +26,7 @@
 ## Configuration
 ##########################################################################
 
+
 class AccountConfig(AppConfig):
     name = 'account'
 

diff --git a/dataset/models.py b/dataset/models.py
@@ -34,6 +34,7 @@
 ## Helper Models
 ##########################################################################
 
+
 class License(TimeStampedModel):
     """
     Contains license boilerplate for datasets.
@@ -45,7 +46,7 @@ class License(TimeStampedModel):
     class Meta:
         db_table = 'license'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
 ##########################################################################
@@ -86,7 +87,7 @@ def get_api_detail_url(self):
     def get_absolute_url(self):
         return reverse('dataset:detail', args=(self.owner.name, self.name))
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 ##########################################################################
@@ -159,7 +160,7 @@ def read_csv_headers(self):
             return header, length
         return None  # ?? what to return for not a csv
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 

diff --git a/members/admin.py b/members/admin.py
@@ -29,6 +29,7 @@
 ## Inline Adminstration
 ##########################################################################
 
+
 class ProfileInline(admin.StackedInline):
     """
     Inline administration descriptor for profile object