unicode: Fixed a number of problems where lazily translated objects were not

being converted back to unicode strings correctly. Fixed #4359 and #4361.


git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5320 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 57 insertions, 4 deletions

diff --git a/tests/modeltests/choices/models.py b/tests/modeltests/choices/models.py
index 37d36fe1d8..e287d973bc 100644
--- a/tests/modeltests/choices/models.py
+++ b/tests/modeltests/choices/models.py
@@ -33,7 +33,7 @@ __test__ = {'API_TESTS':"""
 >>> s.gender
 'F'
 >>> a.get_gender_display()
-'Male'
+u'Male'
 >>> s.get_gender_display()
-'Female'
+u'Female'
 """}
diff --git a/tests/regressiontests/invalid_admin_options/models.py b/tests/regressiontests/invalid_admin_options/models.py
index 43bcc533ba..d3158edf38 100644
--- a/tests/regressiontests/invalid_admin_options/models.py
+++ b/tests/regressiontests/invalid_admin_options/models.py
@@ -123,6 +123,9 @@ class ListFilterBadOne(models.Model):
     class Admin:
         list_filter = 'first_name'     
 
+    def __unicode__(self):
+        return self.first_name
+
 model_errors += """invalid_admin_options.listfilterbadone: "admin.list_filter", if given, must be set to a list or tuple.
 """
 
@@ -140,6 +143,9 @@ class ListFilterBadTwo(models.Model):
     class Admin:
         list_filter = ['first_name','last_name','full_name']
 
+    def __unicode__(self):
+        return self.first_name
+
 model_errors += """invalid_admin_options.listfilterbadtwo: "admin.list_filter" refers to 'last_name', which isn't a field.
 invalid_admin_options.listfilterbadtwo: "admin.list_filter" refers to 'full_name', which isn't a field.
 """
@@ -151,7 +157,10 @@ class DateHierarchyBadOne(models.Model):
     
     class Admin:
         date_hierarchy = 'first_name'
-        
+
+    def __unicode__(self):
+        return self.first_name
+
 # TODO: Date Hierarchy needs to check if field is a date/datetime field.
 #model_errors += """invalid_admin_options.datehierarchybadone: "admin.date_hierarchy" refers to 'first_name', which isn't a date field or datetime field.
 #"""
@@ -164,6 +173,9 @@ class DateHierarchyBadTwo(models.Model):
     class Admin:
         date_hierarchy = 'nonexistent'          
 
+    def __unicode__(self):
+        return self.first_name
+
 model_errors += """invalid_admin_options.datehierarchybadtwo: "admin.date_hierarchy" refers to 'nonexistent', which isn't a field.
 """
 
@@ -174,6 +186,9 @@ class DateHierarchyGood(models.Model):
     
     class Admin:
         date_hierarchy = 'birth_day' 
+
+    def __unicode__(self):
+        return self.first_name
       
 class SearchFieldsBadOne(models.Model):
     "Test search_fields, must be a list or tuple."
@@ -182,6 +197,9 @@ class SearchFieldsBadOne(models.Model):
     class Admin:
         search_fields = ('nonexistent')         
 
+    def __unicode__(self):
+        return self.first_name
+
 # TODO: Add search_fields validation
 #model_errors += """invalid_admin_options.seacrhfieldsbadone: "admin.search_fields", if given, must be set to a list or tuple.
 #"""
@@ -197,6 +215,9 @@ class SearchFieldsBadTwo(models.Model):
     class Admin:
         search_fields = ['first_name','last_name']         
 
+    def __unicode__(self):
+        return self.first_name
+
 # TODO: Add search_fields validation
 #model_errors += """invalid_admin_options.seacrhfieldsbadone: "admin.search_fields" refers to 'last_name', which isn't a field.
 #"""
@@ -209,6 +230,8 @@ class SearchFieldsGood(models.Model):
     class Admin:
         search_fields = ['first_name','last_name']
 
+    def __unicode__(self):
+        return self.first_name
 
 class JsBadOne(models.Model):
     "Test js, must be a list or tuple"
@@ -216,6 +239,9 @@ class JsBadOne(models.Model):
     
     class Admin:
         js = 'test.js'
+
+    def __unicode__(self):
+        return self.name
         
 # TODO: Add a js validator
 #model_errors += """invalid_admin_options.jsbadone: "admin.js", if given, must be set to a list or tuple.
@@ -228,6 +254,9 @@ class SaveAsBad(models.Model):
     class Admin:
         save_as = 'not True or False'
 
+    def __unicode__(self):
+        return self.name
+
 # TODO: Add a save_as validator.       
 #model_errors += """invalid_admin_options.saveasbad: "admin.save_as", if given, must be set to True or False.
 #"""
@@ -239,6 +268,9 @@ class SaveOnTopBad(models.Model):
     class Admin:
         save_on_top = 'not True or False'
 
+    def __unicode__(self):
+        return self.name
+
 # TODO: Add a save_on_top validator.       
 #model_errors += """invalid_admin_options.saveontopbad: "admin.save_on_top", if given, must be set to True or False.
 #"""
@@ -250,6 +282,9 @@ class ListSelectRelatedBad(models.Model):
     class Admin:
         list_select_related = 'not True or False'
 
+    def __unicode__(self):
+        return self.name
+
 # TODO: Add a list_select_related validator.       
 #model_errors += """invalid_admin_options.listselectrelatebad: "admin.list_select_related", if given, must be set to True or False.
 #"""
@@ -261,6 +296,9 @@ class ListPerPageBad(models.Model):
     class Admin:
         list_per_page = 89.3
 
+    def __unicode__(self):
+        return self.name
+
 # TODO: Add a list_per_page validator.       
 #model_errors += """invalid_admin_options.listperpagebad: "admin.list_per_page", if given, must be a positive integer.
 #"""
@@ -273,6 +311,9 @@ class FieldsBadOne(models.Model):
     class Admin:
         fields = 'not a tuple'
 
+    def __unicode__(self):
+        return self.first_name
+
 # TODO: Add a fields validator.       
 #model_errors += """invalid_admin_options.fieldsbadone: "admin.fields", if given, must be a tuple.
 #"""
@@ -284,6 +325,9 @@ class FieldsBadTwo(models.Model):
     
     class Admin:
         fields = ('Name', {'description': 'this fieldset needs fields'})
+
+    def __unicode__(self):
+        return self.first_name
         
 # TODO: Add a fields validator.       
 #model_errors += """invalid_admin_options.fieldsbadtwo: "admin.fields" each fieldset must include a 'fields' dict.
@@ -297,6 +341,9 @@ class FieldsBadThree(models.Model):
     class Admin:
         fields = ('Name', {'fields': ('first_name','last_name'),'badoption': 'verybadoption'})
 
+    def __unicode__(self):
+        return self.first_name
+
 # TODO: Add a fields validator.       
 #model_errors += """invalid_admin_options.fieldsbadthree: "admin.fields" fieldset options must be either 'classes' or 'description'.
 #"""
@@ -312,6 +359,9 @@ class FieldsGood(models.Model):
                   ('Name', {'fields': ('first_name','last_name'),'classes': 'collapse'}),
                   (None, {'fields': ('birth_day',),'description': 'enter your b-day'})
                   )
+
+    def __unicode__(self):
+        return self.first_name
                   
 class OrderingBad(models.Model):
     "Test ordering, must be a field."
@@ -321,6 +371,9 @@ class OrderingBad(models.Model):
     class Admin:
         ordering = 'nonexistent'
 
+    def __unicode__(self):
+        return self.first_name
+
 # TODO: Add a ordering validator.       
 #model_errors += """invalid_admin_options.orderingbad: "admin.ordering" refers to 'nonexistent', which isn't a field.
 #"""
@@ -334,4 +387,4 @@ class OrderingBad(models.Model):
 #        manager = 'nonexistent'
 #       
 #model_errors += """invalid_admin_options.managerbad: "admin.manager" refers to 'nonexistent', which isn't a Manager().
-#"""
\ No newline at end of file
+#"""