]> git.0d.be Git - django-panik-combo.git/commitdiff
trivial: apply black
authorFrédéric Péters <fpeters@0d.be>
Sun, 31 Jan 2021 17:18:59 +0000 (18:18 +0100)
committerFrédéric Péters <fpeters@0d.be>
Sun, 31 Jan 2021 17:18:59 +0000 (18:18 +0100)
20 files changed:
panikombo/forms.py
panikombo/migrations/0001_initial.py
panikombo/migrations/0002_episodecell.py
panikombo/migrations/0003_episodeautoselectioncell.py
panikombo/migrations/0004_newsitemautoselectioncell.py
panikombo/migrations/0005_topik.py
panikombo/migrations/0006_itemtopik.py
panikombo/migrations/0007_newsitemautoselectioncell_category.py
panikombo/migrations/0008_topikcell.py
panikombo/migrations/0009_episodeautoselectioncell_period.py
panikombo/migrations/0011_auto_20170418_1154.py
panikombo/migrations/0013_auto_20200611_1121.py
panikombo/migrations/0016_soundscell.py
panikombo/migrations/0018_soundscell_sort_order.py
panikombo/migrations/0019_soundscell_sound_format.py
panikombo/migrations/0020_auto_20201122_2005.py
panikombo/migrations/0021_soundscell_tags.py
panikombo/misc.py
panikombo/models.py
setup.py

index c84dbfab1607522720c1498c357099565b31d51a..ad9b40b77e2229eee41b0a46d51f6a2505bb6f6f 100644 (file)
@@ -6,8 +6,7 @@ from taggit.forms import TagWidget
 
 from emissions.models import SoundFile, Episode
 
-from .models import (SoundCell, EpisodeCell, EpisodeAutoSelectionCell,
-        NewsItemAutoSelectionCell)
+from .models import SoundCell, EpisodeCell, EpisodeAutoSelectionCell, NewsItemAutoSelectionCell
 
 
 class BaseSelect2Widget(Widget):
@@ -29,9 +28,11 @@ class SoundFileWidget(BaseSelect2Widget):
             soundfile = SoundFile.objects.get(id=value)
         except SoundFile.DoesNotExist:
             return 'missing sound %s' % value
-        return '%s - %s - %s' % (soundfile.episode.emission.title,
-                    soundfile.episode.title,
-                    soundfile.title or soundfile.id)
+        return '%s - %s - %s' % (
+            soundfile.episode.emission.title,
+            soundfile.episode.title,
+            soundfile.title or soundfile.id,
+        )
 
 
 class SoundCellForm(forms.ModelForm):
@@ -58,7 +59,7 @@ class EpisodeWidget(BaseSelect2Widget):
 class EpisodeCellForm(forms.ModelForm):
     class Meta:
         model = EpisodeCell
-        fields = ('episode', )
+        fields = ('episode',)
 
     def __init__(self, *args, **kwargs):
         super(EpisodeCellForm, self).__init__(*args, **kwargs)
index fef818b796907f4de1dc99f002359cba16fb845e..760eb5c11f19d6b667b99c4a1748b272d9faf5b2 100644 (file)
@@ -16,7 +16,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='SoundCell',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
+                ),
                 ('placeholder', models.CharField(max_length=20)),
                 ('order', models.PositiveIntegerField()),
                 ('slug', models.SlugField(verbose_name='Slug', blank=True)),
index 712f20bee1f4a141927cef2807e44eb9fd073e14..9755915a0f7b3c95d81ab89e8b21b9eb8b557974 100644 (file)
@@ -17,7 +17,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='EpisodeCell',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
+                ),
                 ('placeholder', models.CharField(max_length=20)),
                 ('order', models.PositiveIntegerField()),
                 ('slug', models.SlugField(verbose_name='Slug', blank=True)),
index 70663a78a96de648766a7168bd1d4bc5d0b7536e..f0ebbe4d7d93981d5e4cb81bbb096400aa532c1b 100644 (file)
@@ -19,7 +19,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='EpisodeAutoSelectionCell',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
+                ),
                 ('placeholder', models.CharField(max_length=20)),
                 ('order', models.PositiveIntegerField()),
                 ('slug', models.SlugField(verbose_name='Slug', blank=True)),
@@ -28,7 +31,16 @@ class Migration(migrations.Migration):
                 ('category', models.ForeignKey(blank=True, to='emissions.Category', null=True)),
                 ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)),
                 ('page', models.ForeignKey(to='data.Page')),
-                ('tags', taggit.managers.TaggableManager(to='taggit.Tag', through='taggit.TaggedItem', blank=True, help_text='A comma-separated list of tags.', verbose_name='Tags')),
+                (
+                    'tags',
+                    taggit.managers.TaggableManager(
+                        to='taggit.Tag',
+                        through='taggit.TaggedItem',
+                        blank=True,
+                        help_text='A comma-separated list of tags.',
+                        verbose_name='Tags',
+                    ),
+                ),
             ],
             options={
                 'verbose_name': 'Automatic Episode Selection',
index f8efc3beabae0f466905fe84f6133d4929bae156..f98ac3767707be309e68e626730ea9dafc237a0e 100644 (file)
@@ -18,7 +18,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='NewsItemAutoSelectionCell',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
+                ),
                 ('placeholder', models.CharField(max_length=20)),
                 ('order', models.PositiveIntegerField()),
                 ('slug', models.SlugField(verbose_name='Slug', blank=True)),
@@ -27,7 +30,16 @@ class Migration(migrations.Migration):
                 ('future', models.BooleanField(default=True, verbose_name='Future Events Only')),
                 ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)),
                 ('page', models.ForeignKey(to='data.Page')),
-                ('tags', taggit.managers.TaggableManager(to='taggit.Tag', through='taggit.TaggedItem', blank=True, help_text='A comma-separated list of tags.', verbose_name='Tags')),
+                (
+                    'tags',
+                    taggit.managers.TaggableManager(
+                        to='taggit.Tag',
+                        through='taggit.TaggedItem',
+                        blank=True,
+                        help_text='A comma-separated list of tags.',
+                        verbose_name='Tags',
+                    ),
+                ),
             ],
             options={
                 'verbose_name': 'Automatic Newsitem Selection',
index d2e339bfa71b560f3f6fa2a7ff4484295669e264..4838e4d49c1589c70a374748d3d09ae6a69e3039 100644 (file)
@@ -15,14 +15,16 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Topik',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
+                ),
                 ('image', models.ImageField(max_length=250, null=True, verbose_name='Image', blank=True)),
                 ('got_focus', models.DateTimeField(default=None, null=True, blank=True)),
                 ('has_focus', models.BooleanField(default=False)),
                 ('page', models.ForeignKey(to='data.Page')),
             ],
-            options={
-            },
+            options={},
             bases=(models.Model,),
         ),
     ]
index 69db3e104fc1f05857ab3e599f88a794ec0e8b65..da68b832ac97ef2e6fbec3b48532a065c8286597 100644 (file)
@@ -15,13 +15,26 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ItemTopik',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('episode', models.ForeignKey(verbose_name='Episode', blank=True, to='emissions.Episode', null=True)),
-                ('newsitem', models.ForeignKey(verbose_name='News Item', blank=True, to='emissions.NewsItem', null=True)),
-                ('topik', models.ForeignKey(verbose_name=b'Topik', blank=True, to='panikombo.Topik', null=True)),
+                (
+                    'id',
+                    models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
+                ),
+                (
+                    'episode',
+                    models.ForeignKey(verbose_name='Episode', blank=True, to='emissions.Episode', null=True),
+                ),
+                (
+                    'newsitem',
+                    models.ForeignKey(
+                        verbose_name='News Item', blank=True, to='emissions.NewsItem', null=True
+                    ),
+                ),
+                (
+                    'topik',
+                    models.ForeignKey(verbose_name=b'Topik', blank=True, to='panikombo.Topik', null=True),
+                ),
             ],
-            options={
-            },
+            options={},
             bases=(models.Model,),
         ),
     ]
index 99db4c7b0fd887cff59df535a31733303b81cd64..684ae8af31cbd2eb891c549ecc52e175523993e7 100644 (file)
@@ -15,7 +15,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='newsitemautoselectioncell',
             name='category',
-            field=models.ForeignKey(verbose_name='Category', blank=True, to='emissions.NewsCategory', null=True),
+            field=models.ForeignKey(
+                verbose_name='Category', blank=True, to='emissions.NewsCategory', null=True
+            ),
             preserve_default=True,
         ),
     ]
index e117285c1bcf26de21eda45b946eaaad2a66756f..042d151e1eb90a2dc5536296726381a5f7a6acce 100644 (file)
@@ -17,7 +17,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='TopikCell',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                (
+                    'id',
+                    models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
+                ),
                 ('placeholder', models.CharField(max_length=20)),
                 ('order', models.PositiveIntegerField()),
                 ('slug', models.SlugField(verbose_name='Slug', blank=True)),
index fdd0c87e0210be658a90c144a017006ed6af7c60..4b7aeb003661902deaacfc2450390f00364367ce 100644 (file)
@@ -14,7 +14,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='episodeautoselectioncell',
             name='period',
-            field=models.PositiveSmallIntegerField(default=0, verbose_name='Period', choices=[(0, 'All'), (1, 'Future'), (2, 'Past')]),
+            field=models.PositiveSmallIntegerField(
+                default=0, verbose_name='Period', choices=[(0, 'All'), (1, 'Future'), (2, 'Past')]
+            ),
             preserve_default=True,
         ),
     ]
index a77b781e97c3f8d0eaa338d92e04deea6dd39bb6..0255805d036ee85d414b7dd2f57e80829729e2d1 100644 (file)
@@ -20,7 +20,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='episodeautoselectioncell',
             name='last_update_timestamp',
-            field=models.DateTimeField(default=datetime.datetime(2017, 4, 18, 11, 54, 35, 51768), auto_now=True),
+            field=models.DateTimeField(
+                default=datetime.datetime(2017, 4, 18, 11, 54, 35, 51768), auto_now=True
+            ),
             preserve_default=False,
         ),
         migrations.AddField(
@@ -31,7 +33,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='episodecell',
             name='last_update_timestamp',
-            field=models.DateTimeField(default=datetime.datetime(2017, 4, 18, 11, 54, 36, 700929), auto_now=True),
+            field=models.DateTimeField(
+                default=datetime.datetime(2017, 4, 18, 11, 54, 36, 700929), auto_now=True
+            ),
             preserve_default=False,
         ),
         migrations.AddField(
@@ -42,7 +46,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='newsitemautoselectioncell',
             name='last_update_timestamp',
-            field=models.DateTimeField(default=datetime.datetime(2017, 4, 18, 11, 54, 39, 362967), auto_now=True),
+            field=models.DateTimeField(
+                default=datetime.datetime(2017, 4, 18, 11, 54, 39, 362967), auto_now=True
+            ),
             preserve_default=False,
         ),
         migrations.AddField(
@@ -53,7 +59,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='soundcell',
             name='last_update_timestamp',
-            field=models.DateTimeField(default=datetime.datetime(2017, 4, 18, 11, 54, 42, 662255), auto_now=True),
+            field=models.DateTimeField(
+                default=datetime.datetime(2017, 4, 18, 11, 54, 42, 662255), auto_now=True
+            ),
             preserve_default=False,
         ),
         migrations.AddField(
@@ -64,7 +72,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='topikcell',
             name='last_update_timestamp',
-            field=models.DateTimeField(default=datetime.datetime(2017, 4, 18, 11, 54, 44, 42144), auto_now=True),
+            field=models.DateTimeField(
+                default=datetime.datetime(2017, 4, 18, 11, 54, 44, 42144), auto_now=True
+            ),
             preserve_default=False,
         ),
     ]
index 384a5d2ad0162a47b85478c2de5706c57db6b697..0d429667fc23589c35139731c9c6b05993e2f2b9 100644 (file)
@@ -17,11 +17,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='itemtopik',
             name='page',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='data.Page'),
+            field=models.ForeignKey(
+                blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='data.Page'
+            ),
         ),
         migrations.AlterField(
             model_name='itemtopik',
             name='topik',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='panikombo.Topik', verbose_name='Topik'),
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='panikombo.Topik',
+                verbose_name='Topik',
+            ),
         ),
     ]
index 829e1c6549971ef8b7cf0a13afd07f347e5fc836..7689991b93a2bffbda0ffe264562e8b70118cebe 100644 (file)
@@ -17,17 +17,34 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='SoundsCell',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
+                    'id',
+                    models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+                ),
                 ('placeholder', models.CharField(max_length=20)),
                 ('order', models.PositiveIntegerField()),
                 ('slug', models.SlugField(blank=True, verbose_name='Slug')),
-                ('extra_css_class', models.CharField(blank=True, max_length=100, verbose_name='Extra classes for CSS styling')),
+                (
+                    'extra_css_class',
+                    models.CharField(
+                        blank=True, max_length=100, verbose_name='Extra classes for CSS styling'
+                    ),
+                ),
                 ('public', models.BooleanField(default=True, verbose_name='Public')),
-                ('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
+                (
+                    'restricted_to_unlogged',
+                    models.BooleanField(default=False, verbose_name='Restrict to unlogged users'),
+                ),
                 ('last_update_timestamp', models.DateTimeField(auto_now=True)),
-                ('include_search_input', models.BooleanField(default=True, verbose_name='Include search input')),
+                (
+                    'include_search_input',
+                    models.BooleanField(default=True, verbose_name='Include search input'),
+                ),
                 ('include_fragments', models.BooleanField(default=True, verbose_name='Include fragments')),
-                ('limit_to_focus', models.BooleanField(default=False, verbose_name='Limit to focused elements')),
+                (
+                    'limit_to_focus',
+                    models.BooleanField(default=False, verbose_name='Limit to focused elements'),
+                ),
                 ('count', models.PositiveSmallIntegerField(default=20, verbose_name='Count')),
                 ('groups', models.ManyToManyField(blank=True, to='auth.Group', verbose_name='Groups')),
                 ('page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='data.Page')),
index a7a1456dd6a11ae1824a32421ec57bc01f98bcab..3453ae06509983692bcce84287fa4b5004681f73 100644 (file)
@@ -15,6 +15,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='soundscell',
             name='sort_order',
-            field=models.CharField(choices=[('-creation_timestamp', 'Reverse chronological (creation)'), ('-first_diffusion', 'Reverse chronological (diffusion)'), ('creation_timestamp', 'Chronological (creation)'), ('first_diffusion', 'Chronological (diffusion)'), ('?', 'Random')], default='-creation_timestamp', max_length=30, verbose_name='Sort order'),
+            field=models.CharField(
+                choices=[
+                    ('-creation_timestamp', 'Reverse chronological (creation)'),
+                    ('-first_diffusion', 'Reverse chronological (diffusion)'),
+                    ('creation_timestamp', 'Chronological (creation)'),
+                    ('first_diffusion', 'Chronological (diffusion)'),
+                    ('?', 'Random'),
+                ],
+                default='-creation_timestamp',
+                max_length=30,
+                verbose_name='Sort order',
+            ),
         ),
     ]
index 2530f1281d67c490f936919cb61ad82d17e06e77..0d8e19d689543e1a2d303d9cc4f98b4c2de3ce18 100644 (file)
@@ -17,6 +17,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='soundscell',
             name='sound_format',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='emissions.Format', verbose_name='Limit to format'),
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='emissions.Format',
+                verbose_name='Limit to format',
+            ),
         ),
     ]
index b3d139611affa2c8cd030f628feffde31dcf1ea3..e515a5bad3063e602f823929930df4fe84bc9691 100644 (file)
@@ -15,11 +15,15 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='soundscell',
             name='maximal_duration',
-            field=models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Maximal duration (in minutes)'),
+            field=models.PositiveIntegerField(
+                blank=True, default=None, null=True, verbose_name='Maximal duration (in minutes)'
+            ),
         ),
         migrations.AddField(
             model_name='soundscell',
             name='minimal_duration',
-            field=models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Minimal duration (in minutes)'),
+            field=models.PositiveIntegerField(
+                blank=True, default=None, null=True, verbose_name='Minimal duration (in minutes)'
+            ),
         ),
     ]
index 65cce83d45635fc2df53a9d6e984a10a527184b5..da5b8ee6c526cfaa045d0dd4bccbf09f9eeaa880 100644 (file)
@@ -16,6 +16,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='soundscell',
             name='tags',
-            field=taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'),
+            field=taggit.managers.TaggableManager(
+                blank=True,
+                help_text='A comma-separated list of tags.',
+                through='taggit.TaggedItem',
+                to='taggit.Tag',
+                verbose_name='Tags',
+            ),
         ),
     ]
index 47d5bac7b5b5f15677a88071c85bb8c6fd28c9a2..71879fffa82954581303356f1abd941f959f9866 100644 (file)
@@ -1,39 +1,43 @@
 # coding: utf-8
 import collections
 
-COMBO_PUBLIC_TEMPLATES = collections.OrderedDict({
-    'standard': {
-        'name': 'Page normale',
-        'template': 'combo/page_template_sidebar.html',
-        'placeholders': collections.OrderedDict({
-            'introduction': {
-                'name': 'Introduction',
-                'optional': True,
+COMBO_PUBLIC_TEMPLATES = collections.OrderedDict(
+    {
+        'standard': {
+            'name': 'Page normale',
+            'template': 'combo/page_template_sidebar.html',
+            'placeholders': collections.OrderedDict(
+                {
+                    'introduction': {
+                        'name': 'Introduction',
+                        'optional': True,
+                    },
+                    'content': {
+                        'name': 'Contenu',
+                    },
+                    'sidebar': {
+                        'name': 'Barre latérale',
+                    },
+                }
+            ),
+        },
+        'fullwidth': {
+            'name': 'Page prenant toute la largeur',
+            'template': 'combo/page_template_full_width.html',
+            'placeholders': {
+                'content': {
+                    'name': 'Contenu',
+                },
             },
-            'content': {
-                'name': 'Contenu',
+        },
+        'standard-about': {
+            'name': 'Section « À propos »',
+            'template': 'combo/page_template_about.html',
+            'placeholders': {
+                'content': {
+                    'name': 'Contenu',
+                },
             },
-            'sidebar': {
-                'name': 'Barre latérale',
-            },
-        })
-    },
-    'fullwidth': {
-        'name': 'Page prenant toute la largeur',
-        'template': 'combo/page_template_full_width.html',
-        'placeholders': {
-            'content': {
-                'name': 'Contenu',
-            },
-        }
-    },
-    'standard-about': {
-        'name': 'Section « À propos »',
-        'template': 'combo/page_template_about.html',
-        'placeholders': {
-            'content': {
-                'name': 'Contenu',
-            },
-        }
-    },
-})
+        },
+    }
+)
index 58e728aa42e38ba928004fb35ca5bd4a29a00975..1a18f2222e094825c2e16716efbf2da514a1dd2d 100644 (file)
@@ -17,6 +17,7 @@ from combo.data.library import register_cell_class
 
 from emissions.models import Episode, NewsItem, SoundFile
 
+
 @register_cell_class
 class SoundCell(CellBase):
     soundfile = models.ForeignKey('emissions.SoundFile', null=True)
@@ -31,6 +32,7 @@ class SoundCell(CellBase):
 
     def get_default_form_class(self):
         from .forms import SoundCellForm
+
         return SoundCellForm
 
     def get_included_items(self):
@@ -42,13 +44,12 @@ class SoundCell(CellBase):
         if self.soundfile:
             if self.soundfile.fragment:
                 return u'%s - %s - %s' % (
-                        self.soundfile.episode.emission.title,
-                        self.soundfile.episode.title,
-                        self.soundfile.title)
+                    self.soundfile.episode.emission.title,
+                    self.soundfile.episode.title,
+                    self.soundfile.title,
+                )
             else:
-                return u'%s - %s' % (
-                        self.soundfile.episode.emission.title,
-                        self.soundfile.episode.title)
+                return u'%s - %s' % (self.soundfile.episode.emission.title, self.soundfile.episode.title)
 
         return ''
 
@@ -74,13 +75,12 @@ class EpisodeCell(CellBase):
 
     def get_default_form_class(self):
         from .forms import EpisodeCellForm
+
         return EpisodeCellForm
 
     def get_additional_label(self):
         if self.episode:
-            return u'%s - %s' % (
-                        self.episode.emission.title,
-                        self.episode.title)
+            return u'%s - %s' % (self.episode.emission.title, self.episode.title)
         return ''
 
 
@@ -96,14 +96,11 @@ class EpisodeAutoSelectionCell(CellBase):
     and_tags = models.CharField(_('And Tags'), max_length=100, blank=True)
     category = models.ForeignKey('emissions.Category', null=True, blank=True)
     period = models.PositiveSmallIntegerField(
-            _('Period'), default=0,
-            choices=((0, _('All')),
-                     (1, _('Future')),
-                     (2, _('Past'))))
+        _('Period'), default=0, choices=((0, _('All')), (1, _('Future')), (2, _('Past')))
+    )
 
     template_name = 'panikombo/episode_auto_selection.html'
 
-
     class Meta:
         verbose_name = _('Automatic Episode Selection')
 
@@ -119,29 +116,44 @@ class EpisodeAutoSelectionCell(CellBase):
 
         if self.period == 0:
             episodes_queryset = episodes_queryset.extra(
-                    select={ 'first_diffusion': 'emissions_diffusion.datetime', },
-                    select_params=(False, True),
-                    where=['''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
-                                           WHERE episode_id = emissions_episode.id)'''],
-                    tables=['emissions_diffusion'])
+                select={
+                    'first_diffusion': 'emissions_diffusion.datetime',
+                },
+                select_params=(False, True),
+                where=[
+                    '''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
+                                           WHERE episode_id = emissions_episode.id)'''
+                ],
+                tables=['emissions_diffusion'],
+            )
             episodes_queryset = episodes_queryset.order_by('first_diffusion').distinct()
         elif self.period == 1:
             episodes_queryset = episodes_queryset.extra(
-                    select={ 'first_diffusion': 'emissions_diffusion.datetime', },
-                    select_params=(False, True),
-                    where=['''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
+                select={
+                    'first_diffusion': 'emissions_diffusion.datetime',
+                },
+                select_params=(False, True),
+                where=[
+                    '''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
                                            WHERE episode_id = emissions_episode.id) AND
-                                                 datetime >= CURRENT_TIMESTAMP'''],
-                    tables=['emissions_diffusion'])
+                                                 datetime >= CURRENT_TIMESTAMP'''
+                ],
+                tables=['emissions_diffusion'],
+            )
             episodes_queryset = episodes_queryset.order_by('-first_diffusion').distinct()
         elif self.period == 2:
             episodes_queryset = episodes_queryset.extra(
-                    select={ 'first_diffusion': 'emissions_diffusion.datetime', },
-                    select_params=(False, True),
-                    where=['''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
+                select={
+                    'first_diffusion': 'emissions_diffusion.datetime',
+                },
+                select_params=(False, True),
+                where=[
+                    '''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
                                            WHERE episode_id = emissions_episode.id) AND
-                                                 datetime < CURRENT_TIMESTAMP'''],
-                    tables=['emissions_diffusion'])
+                                                 datetime < CURRENT_TIMESTAMP'''
+                ],
+                tables=['emissions_diffusion'],
+            )
             episodes_queryset = episodes_queryset.order_by('-first_diffusion').distinct()
 
         return episodes_queryset
@@ -150,7 +162,7 @@ class EpisodeAutoSelectionCell(CellBase):
         ctx = super(EpisodeAutoSelectionCell, self).get_cell_extra_context(context)
         ctx['title'] = self.title
 
-        if (self.category or self.period or self.tags.count()):
+        if self.category or self.period or self.tags.count():
             ctx['episodes'] = self.get_included_items()
         else:
             ctx['episodes'] = []
@@ -159,6 +171,7 @@ class EpisodeAutoSelectionCell(CellBase):
 
     def get_default_form_class(self):
         from .forms import EpisodeAutoSelectionCellForm
+
         return EpisodeAutoSelectionCellForm
 
     def get_additional_label(self):
@@ -166,14 +179,14 @@ class EpisodeAutoSelectionCell(CellBase):
             return self.title
         return ''
 
+
 @register_cell_class
 class NewsItemAutoSelectionCell(CellBase):
     title = models.CharField(_('Title'), max_length=50, blank=True)
     tags = TaggableManager(_('Tags'), blank=True)
     and_tags = models.CharField(_('And Tags'), max_length=100, blank=True)
     future = models.BooleanField(_('Future Events Only'), default=True)
-    category = models.ForeignKey('emissions.NewsCategory',
-            verbose_name=_('Category'), null=True, blank=True)
+    category = models.ForeignKey('emissions.NewsCategory', verbose_name=_('Category'), null=True, blank=True)
 
     template_name = 'panikombo/newsitem_auto_selection.html'
 
@@ -207,6 +220,7 @@ class NewsItemAutoSelectionCell(CellBase):
 
     def get_default_form_class(self):
         from .forms import NewsItemAutoSelectionCellForm
+
         return NewsItemAutoSelectionCellForm
 
     def get_additional_label(self):
@@ -216,10 +230,8 @@ class NewsItemAutoSelectionCell(CellBase):
 
 
 class ItemTopik(models.Model):
-    newsitem = models.ForeignKey('emissions.NewsItem', verbose_name=_('News Item'),
-            null=True, blank=True)
-    episode = models.ForeignKey('emissions.Episode', verbose_name=_('Episode'),
-            null=True, blank=True)
+    newsitem = models.ForeignKey('emissions.NewsItem', verbose_name=_('News Item'), null=True, blank=True)
+    episode = models.ForeignKey('emissions.Episode', verbose_name=_('Episode'), null=True, blank=True)
     page = models.ForeignKey('data.Page', null=True, blank=True)
 
 
@@ -229,26 +241,29 @@ class SoundsCell(CellBase):
     include_search_input = models.BooleanField(_('Include search input'), default=True)
     include_fragments = models.BooleanField(_('Include fragments'), default=True)
     limit_to_focus = models.BooleanField(_('Limit to focused elements'), default=False)
-    sound_format = models.ForeignKey('emissions.Format',
-            verbose_name=_('Limit to format'), null=True, blank=True)
+    sound_format = models.ForeignKey(
+        'emissions.Format', verbose_name=_('Limit to format'), null=True, blank=True
+    )
     tags = TaggableManager(_('Tags'), blank=True)
     minimal_duration = models.PositiveIntegerField(
-            _('Minimal duration (in minutes)'),
-            default=None, blank=True, null=True)
+        _('Minimal duration (in minutes)'), default=None, blank=True, null=True
+    )
     maximal_duration = models.PositiveIntegerField(
-            _('Maximal duration (in minutes)'),
-            default=None, blank=True, null=True)
+        _('Maximal duration (in minutes)'), default=None, blank=True, null=True
+    )
     count = models.PositiveSmallIntegerField(_('Count'), default=20)
-    sort_order = models.CharField(_('Sort order'), default='-creation_timestamp',
-            max_length=30,
-            choices=[
-                ('-creation_timestamp', _('Reverse chronological (creation)')),
-                ('-first_diffusion', _('Reverse chronological (diffusion)')),
-                ('creation_timestamp', _('Chronological (creation)')),
-                ('first_diffusion', _('Chronological (diffusion)')),
-                ('?', _('Random')),
-            ]
-            )
+    sort_order = models.CharField(
+        _('Sort order'),
+        default='-creation_timestamp',
+        max_length=30,
+        choices=[
+            ('-creation_timestamp', _('Reverse chronological (creation)')),
+            ('-first_diffusion', _('Reverse chronological (diffusion)')),
+            ('creation_timestamp', _('Chronological (creation)')),
+            ('first_diffusion', _('Chronological (diffusion)')),
+            ('?', _('Random')),
+        ],
+    )
 
     class Meta:
         verbose_name = _('Sounds')
@@ -273,14 +288,24 @@ class SoundsCell(CellBase):
             soundfiles = soundfiles.filter(duration__lte=self.maximal_duration * 60)
         if self.tags.exists():
             soundfiles = soundfiles.filter(episode__tags__in=self.tags.all())
-        soundfiles = soundfiles.select_related().extra(
-                    select={'first_diffusion': 'emissions_diffusion.datetime', },
-                    select_params=(False, True),
-                    where=['''datetime = (SELECT MIN(datetime)
+        soundfiles = (
+            soundfiles.select_related()
+            .extra(
+                select={
+                    'first_diffusion': 'emissions_diffusion.datetime',
+                },
+                select_params=(False, True),
+                where=[
+                    '''datetime = (SELECT MIN(datetime)
                                             FROM emissions_diffusion
-                                        WHERE episode_id = emissions_episode.id)'''],
-                    tables=['emissions_diffusion'],).order_by(self.sort_order).distinct()
+                                        WHERE episode_id = emissions_episode.id)'''
+                ],
+                tables=['emissions_diffusion'],
+            )
+            .order_by(self.sort_order)
+            .distinct()
+        )
         return {
             'include_search_input': self.include_search_input,
-            'soundfiles': soundfiles[:self.count],
+            'soundfiles': soundfiles[: self.count],
         }
index fc90cfca014d7ad1c185edeebb746ea6b2e3e37a..f769a81454df6dcd96a318c3c0e105e1ee56c08a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,11 @@ def get_version():
         with open('VERSION', 'r') as v:
             return v.read()
     if os.path.exists('.git'):
-        p = subprocess.Popen(['git', 'describe', '--dirty=.dirty', '--match=v*'],
-                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p = subprocess.Popen(
+            ['git', 'describe', '--dirty=.dirty', '--match=v*'],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
         result = p.communicate()[0]
         if p.returncode == 0:
             result = result.decode('ascii').strip()[1:]  # strip spaces/newlines and initial v
@@ -40,9 +43,7 @@ def get_version():
                 version = result
             return version
         else:
-            return '0.0.post%s' % len(
-                    subprocess.check_output(
-                            ['git', 'rev-list', 'HEAD']).splitlines())
+            return '0.0.post%s' % len(subprocess.check_output(['git', 'rev-list', 'HEAD']).splitlines())
     return '0.0'
 
 
@@ -59,6 +60,7 @@ class compile_translations(Command):
     def run(self):
         try:
             from django.core.management import call_command
+
             for path, dirs, files in os.walk('panikombo'):
                 if 'locale' not in dirs:
                     continue
@@ -106,5 +108,5 @@ setup(
         'compile_translations': compile_translations,
         'install_lib': install_lib,
         'sdist': sdist,
-    }
+    },
 )