mirror of
https://github.com/django/django.git
synced 2025-10-26 15:16:09 +00:00
Refs #23919 -- Removed python_2_unicode_compatible decorator usage
This commit is contained in:
@@ -12,13 +12,11 @@ from django.contrib.contenttypes.fields import (
|
||||
)
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.db import models
|
||||
from django.utils.encoding import python_2_unicode_compatible
|
||||
|
||||
|
||||
# Who remembers high school biology?
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Domain(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
|
||||
@@ -26,7 +24,6 @@ class Domain(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Kingdom(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
domain = models.ForeignKey(Domain, models.CASCADE)
|
||||
@@ -35,7 +32,6 @@ class Kingdom(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Phylum(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
kingdom = models.ForeignKey(Kingdom, models.CASCADE)
|
||||
@@ -44,7 +40,6 @@ class Phylum(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Klass(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
phylum = models.ForeignKey(Phylum, models.CASCADE)
|
||||
@@ -53,7 +48,6 @@ class Klass(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Order(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
klass = models.ForeignKey(Klass, models.CASCADE)
|
||||
@@ -62,7 +56,6 @@ class Order(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Family(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
order = models.ForeignKey(Order, models.CASCADE)
|
||||
@@ -71,7 +64,6 @@ class Family(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Genus(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
family = models.ForeignKey(Family, models.CASCADE)
|
||||
@@ -80,7 +72,6 @@ class Genus(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Species(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
genus = models.ForeignKey(Genus, models.CASCADE)
|
||||
@@ -91,7 +82,6 @@ class Species(models.Model):
|
||||
# and we'll invent a new thing so we have a model with two foreign keys
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class HybridSpecies(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
parent_1 = models.ForeignKey(Species, models.CASCADE, related_name='child_1')
|
||||
@@ -101,7 +91,6 @@ class HybridSpecies(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Topping(models.Model):
|
||||
name = models.CharField(max_length=30)
|
||||
|
||||
@@ -109,7 +98,6 @@ class Topping(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Pizza(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
toppings = models.ManyToManyField(Topping)
|
||||
@@ -118,7 +106,6 @@ class Pizza(models.Model):
|
||||
return self.name
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class TaggedItem(models.Model):
|
||||
tag = models.CharField(max_length=30)
|
||||
|
||||
@@ -130,7 +117,6 @@ class TaggedItem(models.Model):
|
||||
return self.tag
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class Bookmark(models.Model):
|
||||
url = models.URLField()
|
||||
tags = GenericRelation(TaggedItem)
|
||||
|
||||
Reference in New Issue
Block a user