Skip to content

Commit c82c9b5

Browse files
committed
Fix formatting issues reported by flake8
1 parent 9077ab4 commit c82c9b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+525
-190
lines changed

blogs/admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ class FeedAggregateAdmin(admin.ModelAdmin):
2222
list_display = ['name', 'slug', 'description']
2323
prepopulated_fields = {'slug': ('name',)}
2424

25+
2526
admin.site.register(Feed)

blogs/templatetags/blogs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ def feed_list(slug, limit=10):
2323
"""
2424
return BlogEntry.objects.filter(
2525
feed__feedaggregate__slug=slug).order_by('-pub_date')[:limit]
26-

blogs/tests/test_templatetags.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ def test_feed_list(self):
6363
)
6464
fa.feeds.add(f1, f2)
6565

66-
6766
t = Template("""
6867
{% load blogs %}
6968
{% feed_list 'test' as entries %}

boxes/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
DEFAULT_MARKUP_TYPE = getattr(settings, 'DEFAULT_MARKUP_TYPE', 'restructuredtext')
1717

18+
1819
class Box(ContentManageable):
1920
label = models.SlugField(max_length=100, unique=True)
2021
content = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE)

boxes/tests.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55

66
logging.disable(logging.CRITICAL)
77

8+
89
class BaseTestCase(TestCase):
910
def setUp(self):
1011
self.box = Box.objects.create(label='test', content='test content')
1112

13+
1214
class TemplateTagTests(BaseTestCase):
1315
def render(self, tmpl, **context):
1416
t = template.Template(tmpl)
@@ -22,6 +24,7 @@ def test_tag_invalid_label(self):
2224
r = self.render('{% load boxes %}{% box "missing" %}')
2325
self.assertEqual(r, '')
2426

27+
2528
class ViewTests(BaseTestCase):
2629

2730
@override_settings(ROOT_URLCONF='boxes.urls')

boxes/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from django.shortcuts import get_object_or_404
33
from .models import Box
44

5+
56
def box(request, label):
67
b = get_object_or_404(Box, label=label)
78
return HttpResponse(b.content.rendered)

cms/management/commands/create_initial_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def flush_handler(self, do_flush, verbosity):
6060
'You have provided the --flush argument, this will cleanup '
6161
'the database before creating new data.\n'
6262
'Type \'y\' or \'yes\' to continue, \'n\' or \'no\' to cancel: '
63-
)
63+
)
6464
else:
6565
msg = (
6666
'Note that this command won\'t cleanup the database before '

cms/tests.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,30 +48,48 @@ def test_get_fieldsets(self):
4848
self.assertEqual(
4949
fieldsets,
5050
[(None, {'fields': ['foo']}),
51-
('CMS metadata', {'fields': [('creator', 'created'), ('last_modified_by', 'updated')], 'classes': ('collapse',)})]
51+
('CMS metadata', {
52+
'fields': [('creator', 'created'), ('last_modified_by', 'updated')],
53+
'classes': ('collapse',)
54+
})]
5255
)
5356

5457
def test_save_model(self):
5558
admin = self.make_admin()
5659
request = mock.Mock()
5760
obj = mock.Mock()
5861
admin.save_model(request=request, obj=obj, form=None, change=False)
59-
self.assertEqual(obj.creator, request.user, "save_model didn't set obj.creator to request.user")
62+
self.assertEqual(
63+
obj.creator,
64+
request.user,
65+
"save_model didn't set obj.creator to request.user"
66+
)
6067

6168
def test_update_model(self):
6269
admin = self.make_admin()
6370
request = mock.Mock()
6471
obj = mock.Mock()
6572
admin.save_model(request=request, obj=obj, form=None, change=True)
66-
self.assertEqual(obj.last_modified_by, request.user, "save_model didn't set obj.last_modified_by to request.user")
73+
self.assertEqual(
74+
obj.last_modified_by,
75+
request.user,
76+
"save_model didn't set obj.last_modified_by to request.user"
77+
)
6778

6879

6980
class TemplateTagsTest(unittest.TestCase):
7081
def test_iso_time_tag(self):
7182
now = datetime.datetime(2014, 1, 1, 12, 0)
7283
template = Template("{% load cms %}{% iso_time_tag now %}")
7384
rendered = template.render(Context({'now': now}))
74-
self.assertIn('<time datetime="2014-01-01T12:00:00"><span class="say-no-more">2014-</span>01-01</time>', rendered)
85+
expected = (
86+
'<time datetime="2014-01-01T12:00:00">'
87+
'<span class="say-no-more">2014-</span>01-01</time>'
88+
)
89+
self.assertIn(
90+
expected,
91+
rendered
92+
)
7593

7694

7795
class Test404(TestCase):

companies/tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
class CompaniesTagsTests(TestCase):
88
def test_render_email(self):
99
self.assertEqual(render_email(''), None)
10-
self.assertEqual(render_email('[email protected]'), 'firstname<span>.</span>lastname<span>@</span>domain<span>.</span>com')
10+
self.assertEqual(
11+
render_email('[email protected]'),
12+
'firstname<span>.</span>lastname<span>@</span>domain<span>.</span>com'
13+
)

docs/source/conf.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@
4040
# -- Options for LaTeX output ---------------------------------------------
4141

4242
latex_elements = {
43-
# The paper size ('letterpaper' or 'a4paper').
44-
#'papersize': 'letterpaper',
43+
# The paper size ('letterpaper' or 'a4paper').
44+
# 'papersize': 'letterpaper',
4545

46-
# The font size ('10pt', '11pt' or '12pt').
47-
#'pointsize': '10pt',
46+
# The font size ('10pt', '11pt' or '12pt').
47+
# 'pointsize': '10pt',
4848

49-
# Additional stuff for the LaTeX preamble.
50-
#'preamble': '',
49+
# Additional stuff for the LaTeX preamble.
50+
# 'preamble': '',
5151
}
5252

5353
# Grouping the document tree into LaTeX files. List of tuples
5454
# (source start file, target name, title,
5555
# author, documentclass [howto, manual, or own class]).
5656
latex_documents = [
57-
('index', 'PythonorgWebsite.tex', 'Python.org Website Documentation',
58-
'Python Software Foundation', 'manual'),
57+
('index', 'PythonorgWebsite.tex', 'Python.org Website Documentation',
58+
'Python Software Foundation', 'manual'),
5959
]
6060

6161
# -- Options for manual page output ---------------------------------------
@@ -73,7 +73,7 @@
7373
# (source start file, target name, title, author,
7474
# dir menu entry, description, category)
7575
texinfo_documents = [
76-
('index', 'PythonorgWebsite', 'Python.org Website Documentation',
77-
'Python Software Foundation', 'PythonorgWebsite', '',
78-
'Miscellaneous'),
76+
('index', 'PythonorgWebsite', 'Python.org Website Documentation',
77+
'Python Software Foundation', 'PythonorgWebsite', '',
78+
'Miscellaneous'),
7979
]

0 commit comments

Comments
 (0)