Skip to content

Commit

Permalink
unicode: Fixed one of the changes in [5320] in a slightly different w…
Browse files Browse the repository at this point in the history 
…ay. This

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
  • Loading branch information
@malcolmt
malcolmt committed May 24, 2007
1 parent 9c44751 commit 19d71a2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 57 deletions.
2 changes: 1 addition & 1 deletion django/db/models/options.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def __init__(self, fields=None, js=None, list_display=None, list_display_links=N
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
Expand Down
4 changes: 3 additions & 1 deletion django/utils/encoding.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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:
Expand Down
57 changes: 2 additions & 55 deletions tests/regressiontests/invalid_admin_options/models.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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.
""" """


Expand All @@ -143,9 +140,6 @@ def full_name(self):
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.
""" """
Expand All @@ -157,10 +151,7 @@ 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.
#""" #"""
Expand All @@ -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.
""" """


Expand All @@ -186,9 +174,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."
Expand All @@ -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.
#""" #"""
Expand All @@ -215,9 +197,6 @@ def _last_name(self):
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.
#""" #"""
Expand All @@ -230,18 +209,13 @@ 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"
name = models.CharField(maxlength=30) name = models.CharField(maxlength=30)


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.
Expand All @@ -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.
#""" #"""
Expand All @@ -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.
#""" #"""
Expand All @@ -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.
#""" #"""
Expand All @@ -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.
#""" #"""
Expand All @@ -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.
#""" #"""
Expand All @@ -325,9 +284,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.
Expand All @@ -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'.
#""" #"""
Expand All @@ -359,9 +312,6 @@ class Admin:
('Name', {'fields': ('first_name','last_name'),'classes': 'collapse'}), ('Name', {'fields': ('first_name','last_name'),'classes': 'collapse'}),
(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."
Expand All @@ -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.
#""" #"""
Expand All @@ -387,4 +334,4 @@ def __unicode__(self):
# manager = 'nonexistent' # manager = 'nonexistent'
# #
#model_errors += """invalid_admin_options.managerbad: "admin.manager" refers to 'nonexistent', which isn't a Manager(). #model_errors += """invalid_admin_options.managerbad: "admin.manager" refers to 'nonexistent', which isn't a Manager().
#""" #"""

0 comments on commit 19d71a2

Please sign in to comment.