Skip to content

Commit a3d3d4b

Browse files
matthiaskmatthiask
committed
Reformat everything using black
1 parent 9366259 commit a3d3d4b

96 files changed

Lines changed: 3296 additions & 2981 deletions

Some content is hidden

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

‎CHANGELOG.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Change log
66
`Next version`_
77
~~~~~~~~~~~~~~~
88

9+
- Reformatted everything using black.
10+
911

1012
`v1.15.0`_ (2018-12-21)
1113
~~~~~~~~~~~~~~~~~~~~~~~

‎feincms/__init__.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import absolute_import, unicode_literals
22

33
VERSION = (1, 15, 0)
4-
__version__ = '.'.join(map(str, VERSION))
4+
__version__ = ".".join(map(str, VERSION))
55

66

77
class LazySettings(object):
@@ -10,7 +10,7 @@ def _load_settings(self):
1010
from django.conf import settings as django_settings
1111

1212
for key in dir(default_settings):
13-
if not key.startswith('FEINCMS_'):
13+
if not key.startswith("FEINCMS_"):
1414
continue
1515

1616
value = getattr(default_settings, key)
@@ -46,6 +46,7 @@ def ensure_completely_loaded(force=False):
4646
return True
4747

4848
from django.apps import apps
49+
4950
if not apps.ready:
5051
return
5152

@@ -61,13 +62,17 @@ def ensure_completely_loaded(force=False):
6162
import django
6263
from distutils.version import LooseVersion
6364

64-
if LooseVersion(django.get_version()) < LooseVersion('1.8'):
65+
if LooseVersion(django.get_version()) < LooseVersion("1.8"):
6566

6667
for model in apps.get_models():
6768
for cache_name in (
68-
'_field_cache', '_field_name_cache', '_m2m_cache',
69-
'_related_objects_cache', '_related_many_to_many_cache',
70-
'_name_map'):
69+
"_field_cache",
70+
"_field_name_cache",
71+
"_m2m_cache",
72+
"_related_objects_cache",
73+
"_related_many_to_many_cache",
74+
"_name_map",
75+
):
7176
try:
7277
delattr(model._meta, cache_name)
7378
except AttributeError:
@@ -85,7 +90,7 @@ def ensure_completely_loaded(force=False):
8590
# get_models cache again here. If we don't do this, Django 1.5 chokes
8691
# on a model validation error (Django 1.4 doesn't exhibit this
8792
# problem). See Issue #323 on github.
88-
if hasattr(apps, 'cache'):
93+
if hasattr(apps, "cache"):
8994
apps.cache.get_models.cache_clear()
9095

9196
if apps.ready:

‎feincms/_internal.py‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
from django.template.loader import render_to_string
1212

1313

14-
__all__ = (
15-
'monkeypatch_method', 'monkeypatch_property',
16-
)
14+
__all__ = ("monkeypatch_method", "monkeypatch_property")
1715

1816

1917
def monkeypatch_method(cls):
@@ -28,6 +26,7 @@ def <newmethod>(self, [...]):
2826
def decorator(func):
2927
setattr(cls, func.__name__, func)
3028
return func
29+
3130
return decorator
3231

3332

@@ -43,24 +42,23 @@ def <newmethod>(self, [...]):
4342
def decorator(func):
4443
setattr(cls, func.__name__, property(func))
4544
return func
45+
4646
return decorator
4747

4848

49-
if LooseVersion(get_version()) < LooseVersion('1.10'):
49+
if LooseVersion(get_version()) < LooseVersion("1.10"):
50+
5051
def ct_render_to_string(template, ctx, **kwargs):
5152
from django.template import RequestContext
5253

53-
context_instance = kwargs.get('context')
54-
if context_instance is None and kwargs.get('request'):
55-
context_instance = RequestContext(kwargs['request'])
54+
context_instance = kwargs.get("context")
55+
if context_instance is None and kwargs.get("request"):
56+
context_instance = RequestContext(kwargs["request"])
57+
58+
return render_to_string(template, ctx, context_instance=context_instance)
59+
5660

57-
return render_to_string(
58-
template,
59-
ctx,
60-
context_instance=context_instance)
6161
else:
62+
6263
def ct_render_to_string(template, ctx, **kwargs):
63-
return render_to_string(
64-
template,
65-
ctx,
66-
request=kwargs.get('request'))
64+
return render_to_string(template, ctx, request=kwargs.get("request"))

‎feincms/admin/__init__.py‎

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

66

77
FieldListFilter.register(
8-
lambda f: getattr(f, 'parent_filter', False),
8+
lambda f: getattr(f, "parent_filter", False),
99
ParentFieldListFilter,
10-
take_priority=True)
10+
take_priority=True,
11+
)
1112
FieldListFilter.register(
12-
lambda f: getattr(f, 'category_filter', False),
13+
lambda f: getattr(f, "category_filter", False),
1314
CategoryFieldListFilter,
14-
take_priority=True)
15+
take_priority=True,
16+
)

‎feincms/admin/filters.py‎

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,44 @@ class ParentFieldListFilter(ChoicesFieldListFilter):
2626
my_model_field.page_parent_filter = True
2727
"""
2828

29-
def __init__(self, f, request, params, model, model_admin,
30-
field_path=None):
29+
def __init__(self, f, request, params, model, model_admin, field_path=None):
3130
super(ParentFieldListFilter, self).__init__(
32-
f, request, params, model, model_admin, field_path)
31+
f, request, params, model, model_admin, field_path
32+
)
3333

34-
parent_ids = model.objects.exclude(parent=None).values_list(
35-
"parent__id", flat=True).order_by("parent__id").distinct()
34+
parent_ids = (
35+
model.objects.exclude(parent=None)
36+
.values_list("parent__id", flat=True)
37+
.order_by("parent__id")
38+
.distinct()
39+
)
3640
parents = model.objects.filter(pk__in=parent_ids).values_list(
37-
"pk", "title", "level")
38-
self.lookup_choices = [(
39-
pk,
40-
"%s%s" % (
41-
"&nbsp;&nbsp;" * level,
42-
shorten_string(title, max_length=25)),
43-
) for pk, title, level in parents]
41+
"pk", "title", "level"
42+
)
43+
self.lookup_choices = [
44+
(
45+
pk,
46+
"%s%s" % ("&nbsp;&nbsp;" * level, shorten_string(title, max_length=25)),
47+
)
48+
for pk, title, level in parents
49+
]
4450

4551
def choices(self, cl):
4652
yield {
47-
'selected': self.lookup_val is None,
48-
'query_string': cl.get_query_string({}, [self.lookup_kwarg]),
49-
'display': _('All')
53+
"selected": self.lookup_val is None,
54+
"query_string": cl.get_query_string({}, [self.lookup_kwarg]),
55+
"display": _("All"),
5056
}
5157

5258
for pk, title in self.lookup_choices:
5359
yield {
54-
'selected': pk == int(self.lookup_val or '0'),
55-
'query_string': cl.get_query_string({self.lookup_kwarg: pk}),
56-
'display': mark_safe(smart_text(title))
60+
"selected": pk == int(self.lookup_val or "0"),
61+
"query_string": cl.get_query_string({self.lookup_kwarg: pk}),
62+
"display": mark_safe(smart_text(title)),
5763
}
5864

5965
def title(self):
60-
return _('Parent')
66+
return _("Parent")
6167

6268

6369
class CategoryFieldListFilter(ChoicesFieldListFilter):
@@ -67,10 +73,10 @@ class CategoryFieldListFilter(ChoicesFieldListFilter):
6773
my_model_field.category_filter = True
6874
"""
6975

70-
def __init__(self, f, request, params, model, model_admin,
71-
field_path=None):
76+
def __init__(self, f, request, params, model, model_admin, field_path=None):
7277
super(CategoryFieldListFilter, self).__init__(
73-
f, request, params, model, model_admin, field_path)
78+
f, request, params, model, model_admin, field_path
79+
)
7480

7581
# Restrict results to categories which are actually in use:
7682
if DJANGO_VERSION < (1, 8):
@@ -85,7 +91,7 @@ def __init__(self, f, request, params, model, model_admin,
8591

8692
self.lookup_choices = sorted(
8793
[
88-
(i.pk, '%s (%s)' % (i, i._related_count))
94+
(i.pk, "%s (%s)" % (i, i._related_count))
8995
for i in related_model.objects.annotate(
9096
_related_count=Count(related_name)
9197
).exclude(_related_count=0)
@@ -95,17 +101,17 @@ def __init__(self, f, request, params, model, model_admin,
95101

96102
def choices(self, cl):
97103
yield {
98-
'selected': self.lookup_val is None,
99-
'query_string': cl.get_query_string({}, [self.lookup_kwarg]),
100-
'display': _('All')
104+
"selected": self.lookup_val is None,
105+
"query_string": cl.get_query_string({}, [self.lookup_kwarg]),
106+
"display": _("All"),
101107
}
102108

103109
for pk, title in self.lookup_choices:
104110
yield {
105-
'selected': pk == int(self.lookup_val or '0'),
106-
'query_string': cl.get_query_string({self.lookup_kwarg: pk}),
107-
'display': mark_safe(smart_text(title))
111+
"selected": pk == int(self.lookup_val or "0"),
112+
"query_string": cl.get_query_string({self.lookup_kwarg: pk}),
113+
"display": mark_safe(smart_text(title)),
108114
}
109115

110116
def title(self):
111-
return _('Category')
117+
return _("Category")

0 commit comments

Comments
 (0)