Skip to content

Commit d9b27ad

Browse files
matthiaskmatthiask
committed
-E128 on contents and management
1 parent 76f2c79 commit d9b27ad

File tree

13 files changed

+75
-43
lines changed

13 files changed

+75
-43
lines changed

‎feincms/content/application/models.py‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
from django.conf import settings
1111
from django.core.cache import cache
12-
from django.core.urlresolvers import (Resolver404, resolve, reverse,
13-
NoReverseMatch)
12+
from django.core.urlresolvers import (
13+
Resolver404, resolve, reverse, NoReverseMatch)
1414
from django.db import models
1515
from django.db.models import signals
1616
from django.http import HttpResponse
@@ -38,7 +38,7 @@ def cycle_app_reverse_cache(*args, **kwargs):
3838

3939

4040
def app_reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None,
41-
*vargs, **vkwargs):
41+
*vargs, **vkwargs):
4242
"""
4343
Reverse URLs from application contents
4444
@@ -96,7 +96,8 @@ def app_reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None,
9696
if url_prefix:
9797
# vargs and vkwargs are used to send through additional parameters
9898
# which are uninteresting to us (such as current_app)
99-
return reverse(viewname,
99+
return reverse(
100+
viewname,
100101
url_prefix[0],
101102
args=args,
102103
kwargs=kwargs,
@@ -171,7 +172,8 @@ def initialize_type(cls, APPLICATIONS):
171172
"config": app_conf
172173
}
173174

174-
cls.add_to_class('urlconf_path',
175+
cls.add_to_class(
176+
'urlconf_path',
175177
models.CharField(_('application'), max_length=100, choices=[
176178
(c['urls'], c['name']) for c in cls.ALL_APPS_CONFIG.values()])
177179
)
@@ -218,8 +220,9 @@ def save(self, commit=True, *args, **kwargs):
218220
m = super(ApplicationContentItemEditorForm, self).save(
219221
commit=False, *args, **kwargs)
220222

221-
m.parameters = dict((k, self.cleaned_data[k]) for k
222-
in self.custom_fields if k in self.cleaned_data)
223+
m.parameters = dict(
224+
(k, self.cleaned_data[k])
225+
for k in self.custom_fields if k in self.cleaned_data)
223226

224227
if commit:
225228
m.save(**kwargs)
@@ -274,8 +277,11 @@ def process(self, request, **kw):
274277

275278
# Save the application configuration for reuse elsewhere
276279
request._feincms_extra_context.update({
277-
'app_config': dict(self.app_config,
278-
urlconf_path=self.urlconf_path)})
280+
'app_config': dict(
281+
self.app_config,
282+
urlconf_path=self.urlconf_path,
283+
),
284+
})
279285

280286
view_wrapper = self.app_config.get("view_wrapper", None)
281287
if view_wrapper:

‎feincms/content/comments/models.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
# ------------------------------------------------------------------------
2727
class CommentsContent(models.Model):
28-
comments_enabled = models.BooleanField(_('enabled'), default=True,
28+
comments_enabled = models.BooleanField(
29+
_('enabled'), default=True,
2930
help_text=_('New comments may be added'))
3031

3132
class Meta:

‎feincms/content/contactform/models.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class ContactForm(forms.Form):
1919
email = forms.EmailField(label=_('email'))
2020
subject = forms.CharField(label=_('subject'))
2121

22-
content = forms.CharField(widget=forms.Textarea, required=False,
22+
content = forms.CharField(
23+
widget=forms.Textarea, required=False,
2324
label=_('content'))
2425

2526

‎feincms/content/medialibrary/models.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,19 @@ class Meta:
5252
@classmethod
5353
def initialize_type(cls, TYPE_CHOICES=None):
5454
if TYPE_CHOICES is None:
55-
raise ImproperlyConfigured('You have to set TYPE_CHOICES when'
55+
raise ImproperlyConfigured(
56+
'You have to set TYPE_CHOICES when'
5657
' creating a %s' % cls.__name__)
5758

58-
cls.add_to_class('type', models.CharField(_('type'),
59-
max_length=20, choices=TYPE_CHOICES, default=TYPE_CHOICES[0][0]))
59+
cls.add_to_class(
60+
'type',
61+
models.CharField(
62+
_('type'),
63+
max_length=20,
64+
choices=TYPE_CHOICES,
65+
default=TYPE_CHOICES[0][0],
66+
)
67+
)
6068

6169
def render(self, **kwargs):
6270
ctx = {'content': self}

‎feincms/content/richtext/models.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ class Meta:
102102
verbose_name_plural = _('rich texts')
103103

104104
def render(self, **kwargs):
105-
return render_to_string('content/richtext/default.html',
106-
{'content': self}, context_instance=kwargs.get('context'))
105+
return render_to_string(
106+
'content/richtext/default.html',
107+
{'content': self},
108+
context_instance=kwargs.get('context'))
107109

108110
def save(self, *args, **kwargs):
109111
# TODO: Move this to the form?

‎feincms/content/rss/models.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ class RSSContent(models.Model):
1717
``./manage.py update_rsscontent`` every couple of hours.
1818
"""
1919

20-
title = models.CharField(_('title'), max_length=50,
21-
help_text=_('The rss field is updated several times a day.'
20+
title = models.CharField(
21+
_('title'), max_length=50,
22+
help_text=_(
23+
'The rss field is updated several times a day.'
2224
' A change in the title will only be visible on the home page'
2325
' after the next feed update.'))
2426
link = models.URLField(_('link'))
25-
rendered_content = models.TextField(_('pre-rendered content'), blank=True,
26-
editable=False)
27-
last_updated = models.DateTimeField(_('last updated'),
28-
blank=True, null=True)
27+
rendered_content = models.TextField(
28+
_('pre-rendered content'), blank=True, editable=False)
29+
last_updated = models.DateTimeField(
30+
_('last updated'), blank=True, null=True)
2931
max_items = models.IntegerField(_('max. items'), default=5)
3032

3133
class Meta:
@@ -41,8 +43,8 @@ def cache_content(self, date_format=None, save=True):
4143
entries = feed['entries'][:self.max_items]
4244
if date_format:
4345
for entry in entries:
44-
entry.updated = time.strftime(date_format,
45-
entry.updated_parsed)
46+
entry.updated = time.strftime(
47+
date_format, entry.updated_parsed)
4648

4749
self.rendered_content = render_to_string(
4850
'content/rss/content.html',

‎feincms/content/section/models.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class SectionContent(models.Model):
3232

3333
title = models.CharField(_('title'), max_length=200, blank=True)
3434
richtext = RichTextField(_('text'), blank=True)
35-
mediafile = MediaFileForeignKey(MediaFile, verbose_name=_('media file'),
35+
mediafile = MediaFileForeignKey(
36+
MediaFile, verbose_name=_('media file'),
3637
related_name='+', blank=True, null=True)
3738

3839
class Meta:
@@ -52,9 +53,11 @@ def initialize_type(cls, TYPE_CHOICES=None, cleanse=None):
5253
'You need to set TYPE_CHOICES when creating a'
5354
' %s' % cls.__name__)
5455

55-
cls.add_to_class('type', models.CharField(_('type'),
56+
cls.add_to_class('type', models.CharField(
57+
_('type'),
5658
max_length=10, choices=TYPE_CHOICES,
57-
default=TYPE_CHOICES[0][0]))
59+
default=TYPE_CHOICES[0][0]
60+
))
5861

5962
if cleanse:
6063
cls.cleanse = cleanse

‎feincms/content/template/models.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
22

33
from django.db import models
4-
from django.template.loader import (Context, Template, TemplateDoesNotExist,
5-
find_template_loader)
4+
from django.template.loader import (
5+
Context, Template, TemplateDoesNotExist, find_template_loader)
66
from django.utils.translation import ugettext_lazy as _
77

88

@@ -53,7 +53,8 @@ class Meta:
5353

5454
@classmethod
5555
def initialize_type(cls, TEMPLATE_LOADERS=DEFAULT_TEMPLATE_LOADERS):
56-
cls.template_loaders = [find_template_loader(loader)
56+
cls.template_loaders = [
57+
find_template_loader(loader)
5758
for loader in TEMPLATE_LOADERS if loader]
5859

5960
cls.add_to_class('filename', models.CharField(

‎feincms/content/video/models.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ class VideoContent(models.Model):
2828
}),
2929
)
3030

31-
video = models.URLField(_('video link'),
32-
help_text=_('This should be a link to a youtube or vimeo video,'
31+
video = models.URLField(
32+
_('video link'),
33+
help_text=_(
34+
'This should be a link to a youtube or vimeo video,'
3335
' i.e.: http://www.youtube.com/watch?v=zmj1rpzDRZ0'))
3436

3537
class Meta:
@@ -64,5 +66,7 @@ def ctx_for_video(self, vurl):
6466
def render(self, **kwargs):
6567
context_instance = kwargs.get('context')
6668
ctx = self.ctx_for_video(self.video)
67-
return render_to_string(self.get_templates(ctx['portal']),
68-
ctx, context_instance=context_instance)
69+
return render_to_string(
70+
self.get_templates(ctx['portal']),
71+
ctx,
72+
context_instance=context_instance)

‎feincms/contrib/preview/urls.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from feincms.contrib.preview.views import PreviewHandler
44

55

6-
urlpatterns = patterns('',
6+
urlpatterns = patterns(
7+
'',
78
url(r'^(.*)/_preview/(\d+)/$', PreviewHandler.as_view(),
89
name='feincms_preview'),
910
)

0 commit comments

Comments
 (0)