PEP8 (3f115776) · Commits · Dom Sekotill / django

tests/admin_views/admin.py

+22 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ class ArticleInline(admin.TabularInline):
		})
		)


		class ChapterInline(admin.TabularInline):
		model = Chapter

		@@ -578,10 +579,12 @@ class AdminOrderedFieldAdmin(admin.ModelAdmin):
		ordering = ('order',)
		list_display = ('stuff', 'order')


		class AdminOrderedModelMethodAdmin(admin.ModelAdmin):
		ordering = ('order',)
		list_display = ('stuff', 'some_order')


		class AdminOrderedAdminMethodAdmin(admin.ModelAdmin):
		def some_admin_order(self, obj):
		return obj.order
		@@ -589,13 +592,17 @@ class AdminOrderedAdminMethodAdmin(admin.ModelAdmin):
		ordering = ('order',)
		list_display = ('stuff', 'some_admin_order')


		def admin_ordered_callable(obj):
		return obj.order
		admin_ordered_callable.admin_order_field = 'order'


		class AdminOrderedCallableAdmin(admin.ModelAdmin):
		ordering = ('order',)
		list_display = ('stuff', admin_ordered_callable)


		class ReportAdmin(admin.ModelAdmin):
		def extra(self, request):
		return HttpResponse()
		@@ -612,6 +619,7 @@ class ReportAdmin(admin.ModelAdmin):
		class CustomTemplateBooleanFieldListFilter(BooleanFieldListFilter):
		template = 'custom_filter_template.html'


		class CustomTemplateFilterColorAdmin(admin.ModelAdmin):
		list_filter = (('warm', CustomTemplateBooleanFieldListFilter),)

		@@ -628,12 +636,14 @@ class RelatedPrepopulatedInline1(admin.StackedInline):
		prepopulated_fields = {'slug1': ['name', 'pubdate'],
		'slug2': ['status', 'name']}


		class RelatedPrepopulatedInline2(admin.TabularInline):
		model = RelatedPrepopulated
		extra = 1
		prepopulated_fields = {'slug1': ['name', 'pubdate'],
		'slug2': ['status', 'name']}


		class MainPrepopulatedAdmin(admin.ModelAdmin):
		inlines = [RelatedPrepopulatedInline1, RelatedPrepopulatedInline2]
		fieldsets = (
		@@ -712,14 +722,17 @@ class FormWithoutHiddenField(forms.ModelForm):
		first = forms.CharField()
		second = forms.CharField()


		class FormWithoutVisibleField(forms.ModelForm):
		first = forms.CharField(widget=forms.HiddenInput)
		second = forms.CharField(widget=forms.HiddenInput)


		class FormWithVisibleAndHiddenField(forms.ModelForm):
		first = forms.CharField(widget=forms.HiddenInput)
		second = forms.CharField()


		class EmptyModelVisibleAdmin(admin.ModelAdmin):
		form = FormWithoutHiddenField
		fieldsets = (
		@@ -728,39 +741,48 @@ class EmptyModelVisibleAdmin(admin.ModelAdmin):
		}),
		)


		class EmptyModelHiddenAdmin(admin.ModelAdmin):
		form = FormWithoutVisibleField
		fieldsets = EmptyModelVisibleAdmin.fieldsets


		class EmptyModelMixinAdmin(admin.ModelAdmin):
		form = FormWithVisibleAndHiddenField
		fieldsets = EmptyModelVisibleAdmin.fieldsets


		class CityInlineAdmin(admin.TabularInline):
		model = City
		view_on_site = False


		class StateAdmin(admin.ModelAdmin):
		inlines = [CityInlineAdmin]


		class RestaurantInlineAdmin(admin.TabularInline):
		model = Restaurant
		view_on_site = True


		class CityAdmin(admin.ModelAdmin):
		inlines = [RestaurantInlineAdmin]
		view_on_site = True


		class WorkerAdmin(admin.ModelAdmin):
		def view_on_site(self, obj):
		return '/worker/%s/%s/' % (obj.surname, obj.name)


		class WorkerInlineAdmin(admin.TabularInline):
		model = Worker

		def view_on_site(self, obj):
		return '/worker_inline/%s/%s/' % (obj.surname, obj.name)


		class RestaurantAdmin(admin.ModelAdmin):
		inlines = [WorkerInlineAdmin]
		view_on_site = False

tests/decorators/tests.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ full_decorator = compose(

		fully_decorated = full_decorator(fully_decorated)


		class DecoratorsTest(TestCase):

		def test_attributes(self):

tests/defer/models.py

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ class Secondary(models.Model):
		first = models.CharField(max_length=50)
		second = models.CharField(max_length=50)


		@python_2_unicode_compatible
		class Primary(models.Model):
		name = models.CharField(max_length=50)
		@@ -19,12 +20,15 @@ class Primary(models.Model):
		def __str__(self):
		return self.name


		class Child(Primary):
		pass


		class BigChild(Primary):
		other = models.CharField(max_length=50)


		class ChildProxy(Child):
		class Meta:
		proxy = True

tests/defer_regress/models.py

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,13 +16,16 @@ class Item(models.Model):
		def __str__(self):
		return self.name


		class RelatedItem(models.Model):
		item = models.ForeignKey(Item)


		class Child(models.Model):
		name = models.CharField(max_length=10)
		value = models.IntegerField()


		@python_2_unicode_compatible
		class Leaf(models.Model):
		name = models.CharField(max_length=10)
		@@ -33,14 +36,17 @@ class Leaf(models.Model):
		def __str__(self):
		return self.name


		class ResolveThis(models.Model):
		num = models.FloatField()
		name = models.CharField(max_length=16)


		class Proxy(Item):
		class Meta:
		proxy = True


		@python_2_unicode_compatible
		class SimpleItem(models.Model):
		name = models.CharField(max_length=15)
		@@ -49,29 +55,37 @@ class SimpleItem(models.Model):
		def __str__(self):
		return self.name


		class Feature(models.Model):
		item = models.ForeignKey(SimpleItem)


		class SpecialFeature(models.Model):
		feature = models.ForeignKey(Feature)


		class OneToOneItem(models.Model):
		item = models.OneToOneField(Item, related_name="one_to_one_item")
		name = models.CharField(max_length=15)


		class ItemAndSimpleItem(models.Model):
		item = models.ForeignKey(Item)
		simple = models.ForeignKey(SimpleItem)


		class Profile(models.Model):
		profile1 = models.CharField(max_length=1000, default='profile1')


		class Location(models.Model):
		location1 = models.CharField(max_length=1000, default='location1')


		class Item(models.Model):
		pass


		class Request(models.Model):
		profile = models.ForeignKey(Profile, null=True, blank=True)
		location = models.ForeignKey(Location)

tests/model_forms/tests.py

+8 −3

Original line number	Diff line number	Diff line
		@@ -185,6 +185,7 @@ class BetterWriterForm(forms.ModelForm):
		model = BetterWriter
		fields = '__all__'


		class WriterProfileForm(forms.ModelForm):
		class Meta:
		model = WriterProfile
		@@ -234,6 +235,7 @@ class ColourfulItemForm(forms.ModelForm):

		# model forms for testing work on #9321:


		class StatusNoteForm(forms.ModelForm):
		class Meta:
		model = ArticleStatusNote
		@@ -583,6 +585,7 @@ class IncompleteCategoryFormWithFields(forms.ModelForm):
		fields = ('name', 'slug')
		model = Category


		class IncompleteCategoryFormWithExclude(forms.ModelForm):
		"""
		A form that replaces the model's url field with a custom one. This should
		@@ -788,6 +791,7 @@ class UniqueTest(TestCase):
		"slug": "Django 1.0"}, instance=p)
		self.assertTrue(form.is_valid())


		class ModelToDictTests(TestCase):
		"""
		Tests for forms.models.model_to_dict
		@@ -824,6 +828,7 @@ class ModelToDictTests(TestCase):
		# Ensure many-to-many relation appears as a list
		self.assertIsInstance(d['categories'], list)


		class OldFormForXTests(TestCase):
		def test_base_form(self):
		self.assertEqual(Category.objects.count(), 0)