mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

unicode: Fixed one of the changes in [5320] in a slightly different way. This

Browse Source 
should be backwards compatible with trunk, so it's one less things people need
to change.


git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-05-24 01:01:32 +00:00
parent 9c44751c08
commit 19d71a21df
3 changed files with 6 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/options.py
View File

@ -215,7 +215,7 @@ class AdminOptions(object):
save_on_top=False, list_select_related=False, manager=None, list_per_page=100): save_on_top=False, list_select_related=False, manager=None, list_per_page=100):
self.fields = fields self.fields = fields
self.js = js or [] self.js = js or []
self.list_display = list_display or ['__unicode__'] self.list_display = list_display or ['__str__']
self.list_display_links = list_display_links or [] self.list_display_links = list_display_links or []
self.list_filter = list_filter or [] self.list_filter = list_filter or []
self.date_hierarchy = date_hierarchy self.date_hierarchy = date_hierarchy

4
django/utils/encoding.py
View File

@ -44,7 +44,9 @@ def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
""" """
if strings_only and isinstance(s, (types.NoneType, int)): if strings_only and isinstance(s, (types.NoneType, int)):
return s return s
if not isinstance(s, basestring): if isinstance(s, Promise):
return unicode(s).encode(encoding, errors)
elif not isinstance(s, basestring):
try: try:
return str(s) return str(s)
except UnicodeEncodeError: except UnicodeEncodeError:

53
tests/regressiontests/invalid_admin_options/models.py
View File

@ -123,9 +123,6 @@ class ListFilterBadOne(models.Model):
class Admin: class Admin:
list_filter = 'first_name' 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. model_errors += """invalid_admin_options.listfilterbadone: "admin.list_filter", if given, must be set to a list or tuple.
""" """
@ -143,9 +140,6 @@ class ListFilterBadTwo(models.Model):
class Admin: class Admin:
list_filter = ['first_name','last_name','full_name'] 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. 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. invalid_admin_options.listfilterbadtwo: "admin.list_filter" refers to 'full_name', which isn't a field.
""" """
@ -158,9 +152,6 @@ class DateHierarchyBadOne(models.Model):
class Admin: class Admin:
date_hierarchy = 'first_name' date_hierarchy = 'first_name'
def __unicode__(self):
return self.first_name
# TODO: Date Hierarchy needs to check if field is a date/datetime field. # 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. #model_errors += """invalid_admin_options.datehierarchybadone: "admin.date_hierarchy" refers to 'first_name', which isn't a date field or datetime field.
#""" #"""
@ -173,9 +164,6 @@ class DateHierarchyBadTwo(models.Model):
class Admin: class Admin:
date_hierarchy = 'nonexistent' 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. model_errors += """invalid_admin_options.datehierarchybadtwo: "admin.date_hierarchy" refers to 'nonexistent', which isn't a field.
""" """
@ -187,9 +175,6 @@ class DateHierarchyGood(models.Model):
class Admin: class Admin:
date_hierarchy = 'birth_day' date_hierarchy = 'birth_day'
def __unicode__(self):
return self.first_name
class SearchFieldsBadOne(models.Model): class SearchFieldsBadOne(models.Model):
"Test search_fields, must be a list or tuple." "Test search_fields, must be a list or tuple."
first_name = models.CharField(maxlength=30) first_name = models.CharField(maxlength=30)
@ -197,9 +182,6 @@ class SearchFieldsBadOne(models.Model):
class Admin: class Admin:
search_fields = ('nonexistent') search_fields = ('nonexistent')
def __unicode__(self):
return self.first_name
# TODO: Add search_fields validation # TODO: Add search_fields validation
#model_errors += """invalid_admin_options.seacrhfieldsbadone: "admin.search_fields", if given, must be set to a list or tuple. #model_errors += """invalid_admin_options.seacrhfieldsbadone: "admin.search_fields", if given, must be set to a list or tuple.
#""" #"""
@ -215,9 +197,6 @@ class SearchFieldsBadTwo(models.Model):
class Admin: class Admin:
search_fields = ['first_name','last_name'] search_fields = ['first_name','last_name']
def __unicode__(self):
return self.first_name
# TODO: Add search_fields validation # TODO: Add search_fields validation
#model_errors += """invalid_admin_options.seacrhfieldsbadone: "admin.search_fields" refers to 'last_name', which isn't a field. #model_errors += """invalid_admin_options.seacrhfieldsbadone: "admin.search_fields" refers to 'last_name', which isn't a field.
#""" #"""
@ -230,8 +209,6 @@ class SearchFieldsGood(models.Model):
class Admin: class Admin:
search_fields = ['first_name','last_name'] search_fields = ['first_name','last_name']
def __unicode__(self):
return self.first_name
class JsBadOne(models.Model): class JsBadOne(models.Model):
"Test js, must be a list or tuple" "Test js, must be a list or tuple"
@ -240,9 +217,6 @@ class JsBadOne(models.Model):
class Admin: class Admin:
js = 'test.js' js = 'test.js'
def __unicode__(self):
return self.name
# TODO: Add a js validator # TODO: Add a js validator
#model_errors += """invalid_admin_options.jsbadone: "admin.js", if given, must be set to a list or tuple. #model_errors += """invalid_admin_options.jsbadone: "admin.js", if given, must be set to a list or tuple.
#""" #"""
@ -254,9 +228,6 @@ class SaveAsBad(models.Model):
class Admin: class Admin:
save_as = 'not True or False' save_as = 'not True or False'
def __unicode__(self):
return self.name
# TODO: Add a save_as validator. # TODO: Add a save_as validator.
#model_errors += """invalid_admin_options.saveasbad: "admin.save_as", if given, must be set to True or False. #model_errors += """invalid_admin_options.saveasbad: "admin.save_as", if given, must be set to True or False.
#""" #"""
@ -268,9 +239,6 @@ class SaveOnTopBad(models.Model):
class Admin: class Admin:
save_on_top = 'not True or False' save_on_top = 'not True or False'
def __unicode__(self):
return self.name
# TODO: Add a save_on_top validator. # 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. #model_errors += """invalid_admin_options.saveontopbad: "admin.save_on_top", if given, must be set to True or False.
#""" #"""
@ -282,9 +250,6 @@ class ListSelectRelatedBad(models.Model):
class Admin: class Admin:
list_select_related = 'not True or False' list_select_related = 'not True or False'
def __unicode__(self):
return self.name
# TODO: Add a list_select_related validator. # 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. #model_errors += """invalid_admin_options.listselectrelatebad: "admin.list_select_related", if given, must be set to True or False.
#""" #"""
@ -296,9 +261,6 @@ class ListPerPageBad(models.Model):
class Admin: class Admin:
list_per_page = 89.3 list_per_page = 89.3
def __unicode__(self):
return self.name
# TODO: Add a list_per_page validator. # TODO: Add a list_per_page validator.
#model_errors += """invalid_admin_options.listperpagebad: "admin.list_per_page", if given, must be a positive integer. #model_errors += """invalid_admin_options.listperpagebad: "admin.list_per_page", if given, must be a positive integer.
#""" #"""
@ -311,9 +273,6 @@ class FieldsBadOne(models.Model):
class Admin: class Admin:
fields = 'not a tuple' fields = 'not a tuple'
def __unicode__(self):
return self.first_name
# TODO: Add a fields validator. # TODO: Add a fields validator.
#model_errors += """invalid_admin_options.fieldsbadone: "admin.fields", if given, must be a tuple. #model_errors += """invalid_admin_options.fieldsbadone: "admin.fields", if given, must be a tuple.
#""" #"""
@ -326,9 +285,6 @@ class FieldsBadTwo(models.Model):
class Admin: class Admin:
fields = ('Name', {'description': 'this fieldset needs fields'}) fields = ('Name', {'description': 'this fieldset needs fields'})
def __unicode__(self):
return self.first_name
# TODO: Add a fields validator. # TODO: Add a fields validator.
#model_errors += """invalid_admin_options.fieldsbadtwo: "admin.fields" each fieldset must include a 'fields' dict. #model_errors += """invalid_admin_options.fieldsbadtwo: "admin.fields" each fieldset must include a 'fields' dict.
#""" #"""
@ -341,9 +297,6 @@ class FieldsBadThree(models.Model):
class Admin: class Admin:
fields = ('Name', {'fields': ('first_name','last_name'),'badoption': 'verybadoption'}) fields = ('Name', {'fields': ('first_name','last_name'),'badoption': 'verybadoption'})
def __unicode__(self):
return self.first_name
# TODO: Add a fields validator. # TODO: Add a fields validator.
#model_errors += """invalid_admin_options.fieldsbadthree: "admin.fields" fieldset options must be either 'classes' or 'description'. #model_errors += """invalid_admin_options.fieldsbadthree: "admin.fields" fieldset options must be either 'classes' or 'description'.
#""" #"""
@ -360,9 +313,6 @@ class FieldsGood(models.Model):
(None, {'fields': ('birth_day',),'description': 'enter your b-day'}) (None, {'fields': ('birth_day',),'description': 'enter your b-day'})
) )
def __unicode__(self):
return self.first_name
class OrderingBad(models.Model): class OrderingBad(models.Model):
"Test ordering, must be a field." "Test ordering, must be a field."
first_name = models.CharField(maxlength=30) first_name = models.CharField(maxlength=30)
@ -371,9 +321,6 @@ class OrderingBad(models.Model):
class Admin: class Admin:
ordering = 'nonexistent' ordering = 'nonexistent'
def __unicode__(self):
return self.first_name
# TODO: Add a ordering validator. # TODO: Add a ordering validator.
#model_errors += """invalid_admin_options.orderingbad: "admin.ordering" refers to 'nonexistent', which isn't a field. #model_errors += """invalid_admin_options.orderingbad: "admin.ordering" refers to 'nonexistent', which isn't a field.
#""" #"""