From 2890b34f87710d88848349b5e1d636675e1713e0 Mon Sep 17 00:00:00 2001 From: Situphen Date: Wed, 24 May 2023 00:54:29 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Mise=20=C3=A0=20jour=20triviale=20des=20d?= =?UTF-8?q?=C3=A9pendances=20Python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 ++-- .pre-commit-config.yaml | 4 ++-- requirements-dev.txt | 16 ++++++++-------- requirements.txt | 28 ++++++++++++++-------------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e93217d95f..f9848afe21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ env: PYTHON_VERSION: "3.7" MARIADB_VERSION: "10.4.10" COVERALLS_VERSION: "3.3.1" # check if Coverage needs to be also updated in requirements-ci.txt - BLACK_VERSION: "22.8.0" # needs to be also updated in requirements-dev.txt and .pre-commit-config.yaml - GECKODRIVER_VERSION: "0.31.0" + BLACK_VERSION: "23.3.0" # needs to be also updated in requirements-dev.txt and .pre-commit-config.yaml + GECKODRIVER_VERSION: "0.33.0" # As GitHub Action does not allow environment variables # to be used in services definitions, these are only for diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0df354288f..16873090b1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,11 @@ repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.37.3 + rev: v3.4.0 hooks: - id: pyupgrade args: [--py37-plus] - repo: https://github.com/psf/black - rev: 22.8.0 # needs to be also updated in requirements-dev.txt and .github/workflows/ci.yml + rev: 23.3.0 # needs to be also updated in requirements-dev.txt and .github/workflows/ci.yml hooks: - id: black language_version: python3 diff --git a/requirements-dev.txt b/requirements-dev.txt index af53b28b3d..ec07d397f3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,12 +1,12 @@ -r requirements.txt -black==22.8.0 # needs to be also updated in .github/workflows/ci.yml and .pre-commit-config.yaml +black==23.3.0 # needs to be also updated in .github/workflows/ci.yml and .pre-commit-config.yaml colorlog==6.7.0 -django-debug-toolbar==3.6.0 -django-extensions==3.2.0 -Faker==14.2.0 -pre-commit==2.20.0 +django-debug-toolbar==3.8.1 +django-extensions==3.2.1 +Faker==18.9.0 +pre-commit==2.21.0 PyYAML==6.0 -selenium==4.4.3 -Sphinx==5.1.1 -sphinx-rtd-theme==1.0.0 +selenium==4.9.1 +Sphinx==5.3.0 +sphinx-rtd-theme==1.2.1 diff --git a/requirements.txt b/requirements.txt index 79f87550e9..065cf19368 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,37 +1,37 @@ # Implicit dependencies (optional dependencies of dependencies) elasticsearch-dsl==5.4.0 elasticsearch==5.5.3 -social-auth-app-django==5.0.0 +social-auth-app-django==5.2.0 # Explicit dependencies (references in code) -beautifulsoup4==4.11.1 +beautifulsoup4==4.12.2 django-crispy-forms==1.14.0 -django-model-utils==4.2.0 +django-model-utils==4.3.1 django-munin==0.2.1 django-recaptcha==3.0.0 -Django==3.2.15 +Django==3.2.19 easy-thumbnails[svg]==2.8.3 factory-boy==3.2.1 -geoip2==4.6.0 -GitPython==3.1.27 +geoip2==4.7.0 +GitPython==3.1.31 homoglyphs==2.0.4 -lxml==4.9.1 -Pillow==9.2.0 -pymemcache==3.5.2 -requests==2.28.1 +lxml==4.9.2 +Pillow==9.5.0 +pymemcache==4.0.0 +requests==2.31.0 # Api dependencies -django-cors-headers==3.13.0 -django-filter==22.1 +django-cors-headers==4.0.0 +django-filter==23.2 django-oauth-toolkit==1.7.0 djangorestframework==3.14.0 drf-extensions==0.7.1 dry-rest-permissions==0.1.10 -drf-yasg==1.21.4 +drf-yasg==1.21.5 # Dependencies for slug generation, please be extra careful with those django-uuslug==2.0.0 -python-slugify==6.1.2 +python-slugify==8.0.1 # tomllib was added to the standard library in Python 3.11 # tomli is only needed for older Python versions From 995544a9a42d3a68cf1d48395e96f3fa6cfa6b84 Mon Sep 17 00:00:00 2001 From: Situphen Date: Wed, 24 May 2023 01:00:17 +0200 Subject: [PATCH 2/2] Formatage avec Black --- manage.py | 1 - zds/featured/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20150622_0956.py | 1 - .../0003_remove_featuredresource_authors.py | 1 - .../migrations/0004_auto_20150622_0957.py | 1 - .../migrations/0005_auto_20160114_1604.py | 1 - zds/featured/migrations/0006_python_3.py | 1 - .../migrations/0007_featuredrequested.py | 1 - .../migrations/0008_mandatory_message.py | 1 - zds/featured/views.py | 1 - zds/forum/forms.py | 1 - zds/forum/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20150410_1505.py | 1 - .../migrations/0003_auto_20150414_2324.py | 1 - .../migrations/0003_auto_20151110_1145.py | 1 - .../0004_topic_update_index_date.py | 1 - .../migrations/0005_auto_20151119_2224.py | 1 - .../migrations/0006_auto_20160720_2259.py | 1 - .../migrations/0007_auto_20160827_2035.py | 1 - .../migrations/0008_auto_20161101_1122.py | 1 - .../migrations/0008_remove_forum_image.py | 1 - zds/forum/migrations/0009_remove_topic_key.py | 1 - .../migrations/0010_auto_20161112_1823.py | 1 - .../migrations/0011_auto_20170130_1823.py | 1 - .../migrations/0012_auto_20170204_2239.py | 1 - .../migrations/0013_auto_20170327_1349.py | 1 - .../migrations/0014_topic_github_issue.py | 1 - zds/forum/migrations/0015_python_3.py | 1 - zds/forum/migrations/0016_topic_solved_by.py | 1 - .../migrations/0017_auto_20190114_1301.py | 1 - .../migrations/0019_post_is_potential_spam.py | 1 - ...tential_spam_to_temp_name_for_migration.py | 1 - .../0021_remove_post_is_potential_spam.py | 1 - .../0022_topic_github_repository_name.py | 1 - .../0023_allow_blank_solved_by_topic_field.py | 1 - zds/forum/tests/tests.py | 6 --- zds/forum/views.py | 13 ------- zds/gallery/api/serializers.py | 2 - zds/gallery/api/tests.py | 2 - zds/gallery/api/views.py | 6 --- zds/gallery/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20150409_2122.py | 1 - .../migrations/0003_auto_20150928_1249.py | 1 - zds/gallery/migrations/0004_python_3.py | 1 - .../migrations/0005_auto_20180816_2256.py | 1 - .../migrations/0006_usergallery_is_default.py | 1 - .../migrations/0007_auto_20191122_1154.py | 1 - zds/gallery/mixins.py | 1 - zds/gallery/tests/tests_forms.py | 1 - zds/gallery/tests/tests_views.py | 1 - zds/gallery/views.py | 3 -- zds/member/forms.py | 1 - zds/member/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20150601_1144.py | 1 - .../migrations/0003_auto_20151019_2333.py | 1 - .../0004_profile_allow_temp_visual_changes.py | 1 - .../migrations/0005_profile_github_token.py | 1 - .../migrations/0006_auto_20161119_1650.py | 1 - .../migrations/0007_auto_20161119_1836.py | 1 - .../0008_remove_profile_sdz_tutorial.py | 1 - .../0009_profile_show_staff_badge.py | 1 - .../0010_profile_show_markdown_help.py | 1 - ...11_bannedemailprovider_newemailprovider.py | 1 - zds/member/migrations/0012_profile_licence.py | 1 - .../migrations/0013_auto_20170807_1930.py | 1 - .../0014_profile_use_old_smileys.py | 1 - .../migrations/0015_auto_20170905_2220.py | 1 - zds/member/migrations/0016_python_3.py | 1 - .../0017_profile_email_for_new_mp.py | 1 - .../migrations/0018_auto_20190114_1301.py | 1 - .../0019_profile_username_skeleton.py | 1 - .../migrations/0020_auto_20201018_0841.py | 1 - .../0021_remove_profile_use_old_smileys.py | 1 - .../0022_add_hide_forum_activity.py | 1 - zds/member/tests/tests_forms.py | 1 - zds/member/tests/tests_models.py | 2 - zds/member/tests/views/tests_moderation.py | 1 - zds/member/tests/views/tests_profile.py | 2 - zds/member/views/password_recovery.py | 1 - zds/member/views/register.py | 1 - .../oauth2_provider/0001_initial.py | 1 - zds/mp/migrations/0001_initial.py | 1 - zds/mp/migrations/0002_auto_20150416_1750.py | 1 - zds/mp/migrations/0003_privatepost_hat.py | 1 - zds/mp/migrations/0004_python_3.py | 1 - zds/mp/migrations/0005_auto_20190110_1310.py | 1 - zds/mp/migrations/0006_auto_20190114_1301.py | 1 - .../0007_add_votes_to_private_post.py | 1 - zds/mp/tests/tests_utils.py | 1 - zds/mp/tests/tests_views.py | 38 ------------------- zds/notification/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20151219_2302.py | 1 - .../migrations/0004_auto_20160110_1221.py | 1 - .../migrations/0005_auto_20160111_1936.py | 1 - .../migrations/0006_auto_20160115_1724.py | 1 - .../migrations/0007_auto_20160121_2343.py | 1 - .../migrations/0008_auto_20160507_1504.py | 1 - .../migrations/0009_newtopicsubscription.py | 1 - .../0010_newpublicationsubscription.py | 1 - .../migrations/0011_notification_is_dead.py | 1 - .../migrations/0012_auto_20160703_2255.py | 1 - .../migrations/0013_clean_notifications.py | 1 - .../migrations/0014_pingsubscription.py | 1 - zds/notification/migrations/0015_python_3.py | 1 - .../migrations/0016_auto_20190114_1301.py | 1 - ...n_notifications_new_topic_forums_groups.py | 1 - zds/notification/receivers.py | 1 - zds/notification/tests/tests_tricky.py | 1 - zds/pages/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20170831_1023.py | 1 - zds/pages/migrations/0003_python_3.py | 1 - zds/searchv2/forms.py | 1 - .../management/commands/es_manager.py | 3 -- zds/searchv2/tests/tests_models.py | 1 - zds/searchv2/tests/tests_utils.py | 1 - zds/searchv2/tests/tests_views.py | 5 --- zds/searchv2/views.py | 1 - zds/settings/abstract_base/config.py | 1 - zds/tutorialv2/forms.py | 22 ----------- .../management/commands/adjust_slugs.py | 1 - .../management/commands/migrate_to_zep25.py | 1 - zds/tutorialv2/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20150417_0445.py | 1 - .../migrations/0003_auto_20150423_1429.py | 1 - .../0004_publishablecontent_public_version.py | 1 - .../migrations/0005_auto_20150510_2114.py | 1 - .../0006_publishablecontent_must_reindex.py | 1 - .../migrations/0007_auto_20150803_1059.py | 1 - .../0008_publishedcontent_update_date.py | 1 - .../0009_publishedcontent_authors.py | 1 - .../migrations/0010_publishedcontent_sizes.py | 1 - .../migrations/0011_auto_20160106_2231.py | 1 - .../0012_publishablecontent_tags.py | 1 - .../migrations/0013_auto_20160320_0908.py | 1 - .../migrations/0014_auto_20160331_0415.py | 1 - .../0015_publishedcontent_nb_letter.py | 1 - .../migrations/0016_auto_20170201_1940.py | 1 - .../migrations/0017_auto_20170204_2239.py | 1 - .../0018_publishedcontent_is_obsolete.py | 1 - .../migrations/0019_auto_20170208_1347.py | 1 - .../migrations/0020_auto_20170401_1521.py | 1 - .../migrations/0021_picklistoperation.py | 1 - zds/tutorialv2/migrations/0022_python_3.py | 1 - .../migrations/0023_auto_20190114_1301.py | 1 - ...hablecontent_validation_private_message.py | 1 - .../migrations/0024_publicationevent.py | 1 - .../migrations/0025_auto_20190415_1302.py | 1 - .../migrations/0026_publicationevent_date.py | 1 - .../migrations/0027_auto_20190912_1936.py | 1 - .../migrations/0028_auto_20191024_1918.py | 1 - .../migrations/0029_auto_20191123_1955.py | 1 - .../migrations/0030_contentsuggestion.py | 1 - .../migrations/0031_source_is_url.py | 1 - zds/tutorialv2/migrations/0032_event.py | 1 - .../migrations/0033_move_helpwriting.py | 1 - zds/tutorialv2/migrations/0034_goals.py | 1 - .../0035_alter_publishablecontent_goals.py | 1 - .../0036_alter_contentsuggestion_options.py | 1 - zds/tutorialv2/migrations/0037_labels.py | 1 - zds/tutorialv2/mixins.py | 4 -- zds/tutorialv2/models/database.py | 1 - zds/tutorialv2/publish_container.py | 1 - zds/tutorialv2/tests/__init__.py | 1 - zds/tutorialv2/tests/tests_move.py | 1 - zds/tutorialv2/tests/tests_opinion_views.py | 1 - .../tests/tests_views/tests_addauthor.py | 3 -- .../tests/tests_views/tests_content.py | 4 -- .../tests/tests_views/tests_published.py | 3 -- .../tests/tests_views/tests_stats.py | 1 - zds/tutorialv2/utils.py | 1 - zds/tutorialv2/views/archives.py | 5 --- zds/tutorialv2/views/authors.py | 3 -- zds/tutorialv2/views/comments.py | 4 -- zds/tutorialv2/views/containers_extracts.py | 1 - zds/tutorialv2/views/contents.py | 1 - zds/tutorialv2/views/contributors.py | 2 - zds/tutorialv2/views/download_online.py | 4 -- zds/tutorialv2/views/editorialization.py | 1 - zds/tutorialv2/views/lists.py | 2 - zds/tutorialv2/views/misc.py | 2 - zds/tutorialv2/views/validations_contents.py | 8 ---- zds/utils/api/tests.py | 1 - zds/utils/forms.py | 1 - zds/utils/highlighter.py | 1 - .../clean_alerts_and_notifications.py | 1 - .../management/commands/load_fixtures.py | 1 - zds/utils/management/tests.py | 1 - zds/utils/migrations/0001_initial.py | 1 - .../0002_comment_update_index_date.py | 1 - .../migrations/0003_auto_20150414_2256.py | 1 - .../migrations/0004_auto_20151229_1904.py | 1 - zds/utils/migrations/0005_commentvote.py | 1 - .../migrations/0006_auto_20160509_1633.py | 1 - .../migrations/0007_auto_20160511_2153.py | 1 - .../migrations/0008_auto_20161112_1757.py | 1 - .../migrations/0009_auto_20161113_2328.py | 1 - .../migrations/0010_auto_20170203_2100.py | 1 - .../migrations/0011_auto_20170401_1521.py | 1 - zds/utils/migrations/0012_commentedit.py | 1 - zds/utils/migrations/0013_tags.py | 1 - .../migrations/0014_auto_20170905_2220.py | 1 - zds/utils/migrations/0015_hat_group.py | 1 - zds/utils/migrations/0016_python_3.py | 1 - zds/utils/migrations/0017_hat_is_staff.py | 1 - .../migrations/0018_auto_20171006_2126.py | 1 - .../migrations/0019_auto_20180102_1659.py | 1 - .../migrations/0020_auto_20180501_1059.py | 1 - .../migrations/0021_auto_20180826_1616.py | 1 - .../migrations/0021_auto_20190114_1301.py | 1 - .../migrations/0022_auto_20190115_1249.py | 1 - .../0022_set_default_latest_by_for_alerts.py | 1 - ...23_move_potential_spam_to_comment_model.py | 1 - .../0024_alter_hatrequest_is_granted.py | 1 - zds/utils/migrations/0025_move_helpwriting.py | 1 - zds/utils/templatetags/elasticsearch.py | 1 - zds/utils/templatetags/htmldiff.py | 1 - zds/utils/tests/tests_append_query_params.py | 5 --- zds/utils/tests/tests_captureas.py | 1 - zds/utils/tests/tests_date.py | 2 - zds/utils/tests/tests_interventions.py | 2 - zds/utils/tests/tests_messages.py | 2 - zds/utils/tests/tests_models.py | 2 - zds/utils/validators.py | 1 - 223 files changed, 355 deletions(-) diff --git a/manage.py b/manage.py index 25d42b2935..7e58830c04 100755 --- a/manage.py +++ b/manage.py @@ -55,7 +55,6 @@ def sighandler(signum, frame): os.environ.setdefault("DJANGO_SETTINGS_MODULE", "zds.settings.dev") if len(sys.argv) > 1 and sys.argv[1] in ["migrate", "test"]: - from django.db.backends.mysql.creation import BaseDatabaseCreation BaseDatabaseCreation.sql_table_creation_suffix = patch_create_suffix( diff --git a/zds/featured/migrations/0001_initial.py b/zds/featured/migrations/0001_initial.py index a24030b0f0..c02ec8090f 100644 --- a/zds/featured/migrations/0001_initial.py +++ b/zds/featured/migrations/0001_initial.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0002_auto_20150601_1144"), ] diff --git a/zds/featured/migrations/0002_auto_20150622_0956.py b/zds/featured/migrations/0002_auto_20150622_0956.py index e665b5e805..f75d8f3d61 100644 --- a/zds/featured/migrations/0002_auto_20150622_0956.py +++ b/zds/featured/migrations/0002_auto_20150622_0956.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("featured", "0001_initial"), ] diff --git a/zds/featured/migrations/0003_remove_featuredresource_authors.py b/zds/featured/migrations/0003_remove_featuredresource_authors.py index f276ed9035..2f2a7f7117 100644 --- a/zds/featured/migrations/0003_remove_featuredresource_authors.py +++ b/zds/featured/migrations/0003_remove_featuredresource_authors.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("featured", "0002_auto_20150622_0956"), ] diff --git a/zds/featured/migrations/0004_auto_20150622_0957.py b/zds/featured/migrations/0004_auto_20150622_0957.py index 7ca9c195f7..e69477eb55 100644 --- a/zds/featured/migrations/0004_auto_20150622_0957.py +++ b/zds/featured/migrations/0004_auto_20150622_0957.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("featured", "0003_remove_featuredresource_authors"), ] diff --git a/zds/featured/migrations/0005_auto_20160114_1604.py b/zds/featured/migrations/0005_auto_20160114_1604.py index ae629e7bb4..af48a3cbcf 100644 --- a/zds/featured/migrations/0005_auto_20160114_1604.py +++ b/zds/featured/migrations/0005_auto_20160114_1604.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("featured", "0004_auto_20150622_0957"), ] diff --git a/zds/featured/migrations/0006_python_3.py b/zds/featured/migrations/0006_python_3.py index fd3eb9bd66..d6c2e44cd5 100644 --- a/zds/featured/migrations/0006_python_3.py +++ b/zds/featured/migrations/0006_python_3.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("featured", "0005_auto_20160114_1604"), ] diff --git a/zds/featured/migrations/0007_featuredrequested.py b/zds/featured/migrations/0007_featuredrequested.py index 7c16013163..28ece97659 100644 --- a/zds/featured/migrations/0007_featuredrequested.py +++ b/zds/featured/migrations/0007_featuredrequested.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("contenttypes", "0002_remove_content_type_name"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), diff --git a/zds/featured/migrations/0008_mandatory_message.py b/zds/featured/migrations/0008_mandatory_message.py index e0be4a55b2..7a24ac21da 100644 --- a/zds/featured/migrations/0008_mandatory_message.py +++ b/zds/featured/migrations/0008_mandatory_message.py @@ -14,7 +14,6 @@ def revert(*_): class Migration(migrations.Migration): - dependencies = [ ("featured", "0007_featuredrequested"), ] diff --git a/zds/featured/views.py b/zds/featured/views.py index 467c210284..cf0fddc88b 100644 --- a/zds/featured/views.py +++ b/zds/featured/views.py @@ -169,7 +169,6 @@ def get_initial(self): return initial def form_valid(self, form): - self.object.title = form.cleaned_data.get("title") self.object.type = form.cleaned_data.get("type") self.object.authors = form.cleaned_data.get("authors") diff --git a/zds/forum/forms.py b/zds/forum/forms.py index 03482b12ce..166eb54b16 100644 --- a/zds/forum/forms.py +++ b/zds/forum/forms.py @@ -144,7 +144,6 @@ def clean(self): class MoveTopicForm(forms.Form): - forum = forms.ModelChoiceField( label=_("Forum"), queryset=Forum.objects.all(), diff --git a/zds/forum/migrations/0001_initial.py b/zds/forum/migrations/0001_initial.py index e020e7116d..9e941f1ca4 100644 --- a/zds/forum/migrations/0001_initial.py +++ b/zds/forum/migrations/0001_initial.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0001_initial"), ("auth", "0001_initial"), diff --git a/zds/forum/migrations/0002_auto_20150410_1505.py b/zds/forum/migrations/0002_auto_20150410_1505.py index e91ed43fe5..81aa1a304e 100644 --- a/zds/forum/migrations/0002_auto_20150410_1505.py +++ b/zds/forum/migrations/0002_auto_20150410_1505.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0001_initial"), ] diff --git a/zds/forum/migrations/0003_auto_20150414_2324.py b/zds/forum/migrations/0003_auto_20150414_2324.py index 6fed270ba0..d75e9c81a0 100644 --- a/zds/forum/migrations/0003_auto_20150414_2324.py +++ b/zds/forum/migrations/0003_auto_20150414_2324.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0002_auto_20150410_1505"), ] diff --git a/zds/forum/migrations/0003_auto_20151110_1145.py b/zds/forum/migrations/0003_auto_20151110_1145.py index 14abc2197d..3d49c2b404 100644 --- a/zds/forum/migrations/0003_auto_20151110_1145.py +++ b/zds/forum/migrations/0003_auto_20151110_1145.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0003_auto_20150414_2324"), ] diff --git a/zds/forum/migrations/0004_topic_update_index_date.py b/zds/forum/migrations/0004_topic_update_index_date.py index 0a9e079007..61ab4f4494 100644 --- a/zds/forum/migrations/0004_topic_update_index_date.py +++ b/zds/forum/migrations/0004_topic_update_index_date.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0003_auto_20151110_1145"), ] diff --git a/zds/forum/migrations/0005_auto_20151119_2224.py b/zds/forum/migrations/0005_auto_20151119_2224.py index d411653a88..c56868d4c4 100644 --- a/zds/forum/migrations/0005_auto_20151119_2224.py +++ b/zds/forum/migrations/0005_auto_20151119_2224.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0004_topic_update_index_date"), ] diff --git a/zds/forum/migrations/0006_auto_20160720_2259.py b/zds/forum/migrations/0006_auto_20160720_2259.py index 8a7f632ef8..547a0f2678 100644 --- a/zds/forum/migrations/0006_auto_20160720_2259.py +++ b/zds/forum/migrations/0006_auto_20160720_2259.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0005_auto_20151119_2224"), ] diff --git a/zds/forum/migrations/0007_auto_20160827_2035.py b/zds/forum/migrations/0007_auto_20160827_2035.py index e340eb0bbb..789112a4d8 100644 --- a/zds/forum/migrations/0007_auto_20160827_2035.py +++ b/zds/forum/migrations/0007_auto_20160827_2035.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0006_auto_20160720_2259"), ] diff --git a/zds/forum/migrations/0008_auto_20161101_1122.py b/zds/forum/migrations/0008_auto_20161101_1122.py index 432713b797..0127abc65a 100644 --- a/zds/forum/migrations/0008_auto_20161101_1122.py +++ b/zds/forum/migrations/0008_auto_20161101_1122.py @@ -17,7 +17,6 @@ def force_unicity(*args, **kwargs): class Migration(migrations.Migration): - dependencies = [ ("forum", "0008_remove_forum_image"), ] diff --git a/zds/forum/migrations/0008_remove_forum_image.py b/zds/forum/migrations/0008_remove_forum_image.py index f60ac61764..e5af660a77 100644 --- a/zds/forum/migrations/0008_remove_forum_image.py +++ b/zds/forum/migrations/0008_remove_forum_image.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0007_auto_20160827_2035"), ] diff --git a/zds/forum/migrations/0009_remove_topic_key.py b/zds/forum/migrations/0009_remove_topic_key.py index 0ff7828c48..b6144e4e6e 100644 --- a/zds/forum/migrations/0009_remove_topic_key.py +++ b/zds/forum/migrations/0009_remove_topic_key.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0008_auto_20161101_1122"), ] diff --git a/zds/forum/migrations/0010_auto_20161112_1823.py b/zds/forum/migrations/0010_auto_20161112_1823.py index 7293245156..0709d31175 100644 --- a/zds/forum/migrations/0010_auto_20161112_1823.py +++ b/zds/forum/migrations/0010_auto_20161112_1823.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0009_remove_topic_key"), ] diff --git a/zds/forum/migrations/0011_auto_20170130_1823.py b/zds/forum/migrations/0011_auto_20170130_1823.py index 87ed2b9622..ac73d15383 100644 --- a/zds/forum/migrations/0011_auto_20170130_1823.py +++ b/zds/forum/migrations/0011_auto_20170130_1823.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0010_auto_20161112_1823"), ] diff --git a/zds/forum/migrations/0012_auto_20170204_2239.py b/zds/forum/migrations/0012_auto_20170204_2239.py index 755535a464..e851334f8a 100644 --- a/zds/forum/migrations/0012_auto_20170204_2239.py +++ b/zds/forum/migrations/0012_auto_20170204_2239.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0011_auto_20170130_1823"), ] diff --git a/zds/forum/migrations/0013_auto_20170327_1349.py b/zds/forum/migrations/0013_auto_20170327_1349.py index 39a4e62a38..a21060b6c2 100644 --- a/zds/forum/migrations/0013_auto_20170327_1349.py +++ b/zds/forum/migrations/0013_auto_20170327_1349.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0012_auto_20170204_2239"), ] diff --git a/zds/forum/migrations/0014_topic_github_issue.py b/zds/forum/migrations/0014_topic_github_issue.py index 045d496e81..b3b49f4959 100644 --- a/zds/forum/migrations/0014_topic_github_issue.py +++ b/zds/forum/migrations/0014_topic_github_issue.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0013_auto_20170327_1349"), ] diff --git a/zds/forum/migrations/0015_python_3.py b/zds/forum/migrations/0015_python_3.py index 00fb37eb14..869204c2da 100644 --- a/zds/forum/migrations/0015_python_3.py +++ b/zds/forum/migrations/0015_python_3.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0014_topic_github_issue"), ] diff --git a/zds/forum/migrations/0016_topic_solved_by.py b/zds/forum/migrations/0016_topic_solved_by.py index 82d9632663..4408bf8bdd 100644 --- a/zds/forum/migrations/0016_topic_solved_by.py +++ b/zds/forum/migrations/0016_topic_solved_by.py @@ -14,7 +14,6 @@ def forward(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("forum", "0015_python_3"), diff --git a/zds/forum/migrations/0017_auto_20190114_1301.py b/zds/forum/migrations/0017_auto_20190114_1301.py index abdef06a43..4fc65c6ad9 100644 --- a/zds/forum/migrations/0017_auto_20190114_1301.py +++ b/zds/forum/migrations/0017_auto_20190114_1301.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0016_topic_solved_by"), ] diff --git a/zds/forum/migrations/0019_post_is_potential_spam.py b/zds/forum/migrations/0019_post_is_potential_spam.py index d4b88ee27a..53a520c8b7 100644 --- a/zds/forum/migrations/0019_post_is_potential_spam.py +++ b/zds/forum/migrations/0019_post_is_potential_spam.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0018_auto_20200315_1749"), ] diff --git a/zds/forum/migrations/0020_rename_post_is_potential_spam_to_temp_name_for_migration.py b/zds/forum/migrations/0020_rename_post_is_potential_spam_to_temp_name_for_migration.py index f7e8f45a80..4ce0985271 100644 --- a/zds/forum/migrations/0020_rename_post_is_potential_spam_to_temp_name_for_migration.py +++ b/zds/forum/migrations/0020_rename_post_is_potential_spam_to_temp_name_for_migration.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0019_post_is_potential_spam"), ] diff --git a/zds/forum/migrations/0021_remove_post_is_potential_spam.py b/zds/forum/migrations/0021_remove_post_is_potential_spam.py index bbe4058cdf..e174594df3 100644 --- a/zds/forum/migrations/0021_remove_post_is_potential_spam.py +++ b/zds/forum/migrations/0021_remove_post_is_potential_spam.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0020_rename_post_is_potential_spam_to_temp_name_for_migration"), # We must remove the field AFTER data was copied from this field to the comments table. diff --git a/zds/forum/migrations/0022_topic_github_repository_name.py b/zds/forum/migrations/0022_topic_github_repository_name.py index ef5662e0ad..fe583522fd 100644 --- a/zds/forum/migrations/0022_topic_github_repository_name.py +++ b/zds/forum/migrations/0022_topic_github_repository_name.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0021_remove_post_is_potential_spam"), ] diff --git a/zds/forum/migrations/0023_allow_blank_solved_by_topic_field.py b/zds/forum/migrations/0023_allow_blank_solved_by_topic_field.py index 9f1303e883..afe60940ea 100644 --- a/zds/forum/migrations/0023_allow_blank_solved_by_topic_field.py +++ b/zds/forum/migrations/0023_allow_blank_solved_by_topic_field.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("forum", "0022_topic_github_repository_name"), diff --git a/zds/forum/tests/tests.py b/zds/forum/tests/tests.py index 6ae78c1be0..22ea7bfcc7 100644 --- a/zds/forum/tests/tests.py +++ b/zds/forum/tests/tests.py @@ -18,7 +18,6 @@ class ForumMemberTests(TestCase): def setUp(self): - settings.EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" self.category1 = ForumCategoryFactory(position=1) @@ -383,7 +382,6 @@ def test_edit_post(self): self.assertEqual(result.status_code, 404) def test_edit_post_with_blank(self): - topic1 = TopicFactory(forum=self.forum11, author=self.user) PostFactory(topic=topic1, author=self.user, position=1) post2 = PostFactory(topic=topic1, author=self.user, position=2) @@ -661,7 +659,6 @@ def test_answer_empty(self): self.assertEqual(Post.objects.filter(topic=topic1.pk).count(), 1) def test_add_tag(self): - tag_c_sharp = TagFactory(title="C#") tag_c = TagFactory(title="C") @@ -824,7 +821,6 @@ def test_frontend_can_create_topic_when_profile_can_write(self): class ForumGuestTests(TestCase): def setUp(self): - settings.EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" self.category1 = ForumCategoryFactory(position=1) @@ -1163,7 +1159,6 @@ def get_topics(forum_pk, is_sticky, filter=None): class ManagerTests(TestCase): def setUp(self): - self.cat1 = ForumCategoryFactory() self.forum1 = ForumFactory(category=self.cat1) self.forum2 = ForumFactory(category=self.cat1) @@ -1180,7 +1175,6 @@ def setUp(self): TopicFactory(forum=self.forum3, author=self.staff.user) def test_get_last_topics(self): - topics = Topic.objects.get_last_topics() self.assertEqual(2, len(topics)) diff --git a/zds/forum/views.py b/zds/forum/views.py index b2d4497514..de8edae706 100644 --- a/zds/forum/views.py +++ b/zds/forum/views.py @@ -34,7 +34,6 @@ class CategoriesForumsListView(ListView): - context_object_name = "categories" template_name = "forum/index.html" queryset = ForumCategory.objects.all() @@ -47,7 +46,6 @@ def get_context_data(self, **kwargs): class ForumCategoryForumsDetailView(DetailView): - context_object_name = "category" template_name = "forum/category/index.html" queryset = ForumCategory.objects.all() @@ -59,7 +57,6 @@ def get_context_data(self, **kwargs): class LastTopicsListView(ListView): - context_object_name = "topics" template_name = "forum/last_topics.html" @@ -84,7 +81,6 @@ def get_context_data(self, **kwargs): class ForumTopicsListView(FilterMixin, ForumEditMixin, ZdSPagingListView, UpdateView, SingleObjectMixin): - context_object_name = "topics" paginate_by = settings.ZDS_APP["forum"]["topics_per_page"] template_name = "forum/category/forum.html" @@ -169,7 +165,6 @@ def filter_queryset(self, queryset, filter_param): class TopicPostsListView(ZdSPagingListView, FeatureableMixin, SingleObjectMixin): - context_object_name = "posts" paginate_by = settings.ZDS_APP["forum"]["posts_per_page"] template_name = "forum/topic/index.html" @@ -240,7 +235,6 @@ def get_queryset(self): class TopicNew(CreateView, SingleObjectMixin): - template_name = "forum/topic/new.html" form_class = TopicForm object = None @@ -299,7 +293,6 @@ def form_valid(self, form): class TopicEdit(UpdateView, SingleObjectMixin, TopicEditMixin, FeatureableMixin): - template_name = "forum/topic/edit.html" form_class = TopicForm object = None @@ -427,7 +420,6 @@ def form_valid(self, form): class FindTopic(ZdSPagingListView, SingleObjectMixin): - context_object_name = "topics" template_name = "forum/find/topic.html" paginate_by = settings.ZDS_APP["forum"]["topics_per_page"] @@ -490,7 +482,6 @@ def get_object(self, queryset=None): class FindTopicByTag(FilterMixin, ForumEditMixin, ZdSPagingListView, SingleObjectMixin): - context_object_name = "topics" paginate_by = settings.ZDS_APP["forum"]["topics_per_page"] template_name = "forum/find/topic_by_tag.html" @@ -553,7 +544,6 @@ def filter_queryset(self, queryset, filter_param): class PostNew(CreatePostView): - model_quote = Post template_name = "forum/post/new.html" form_class = PostForm @@ -600,7 +590,6 @@ def get_object(self, queryset=None): class PostEdit(UpdateView, SinglePostObjectMixin, PostEditMixin): - template_name = "forum/post/edit.html" form_class = PostForm @@ -687,7 +676,6 @@ def form_valid(self, form): class PostSignal(UpdateView, SinglePostObjectMixin, PostEditMixin): - http_method_names = ["post"] @method_decorator(login_required) @@ -751,7 +739,6 @@ def get(self, request, *args, **kwargs): class FindPost(ZdSPagingListView, SingleObjectMixin): - context_object_name = "posts" template_name = "forum/find/post.html" paginate_by = settings.ZDS_APP["forum"]["posts_per_page"] diff --git a/zds/gallery/api/serializers.py b/zds/gallery/api/serializers.py index c28d834c9a..d723ae1d19 100644 --- a/zds/gallery/api/serializers.py +++ b/zds/gallery/api/serializers.py @@ -117,7 +117,6 @@ def to_representation(self, value): class ParticipantSerializer(ZdSModelSerializer, GalleryUpdateOrDeleteMixin): - permissions = CustomPermissionField(source="can_write", read_only=True) id = serializers.IntegerField(source="user.pk", required=False) can_write = serializers.BooleanField(write_only=True) @@ -130,7 +129,6 @@ def get_permissions(self, obj): return {"read": True, "write": obj.can_write()} def create(self, validated_data): - if "user" not in validated_data: raise exceptions.ValidationError(_("Le champ `id` est obligatoire pour l'ajout d'un participant")) diff --git a/zds/gallery/api/tests.py b/zds/gallery/api/tests.py index 43ef8be6c1..3859d7f216 100644 --- a/zds/gallery/api/tests.py +++ b/zds/gallery/api/tests.py @@ -35,7 +35,6 @@ def test_get_list_of_gallery_empty(self): self.assertIsNone(response.data.get("previous")) def test_get_list_of_gallery(self): - gallery = GalleryFactory() UserGalleryFactory(user=self.profile.user, gallery=gallery) response = self.client.get(reverse("api:gallery:list")) @@ -210,7 +209,6 @@ def test_delete_fail_no_right(self): self.assertEqual(UserGallery.objects.filter(gallery=self.gallery).count(), 1) def test_delete_fail_linked_content(self): - response = self.client.delete(reverse("api:gallery:detail", kwargs={"pk": self.gallery_tuto.pk})) self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) diff --git a/zds/gallery/api/views.py b/zds/gallery/api/views.py index 732da9a135..4ebceaa182 100644 --- a/zds/gallery/api/views.py +++ b/zds/gallery/api/views.py @@ -25,7 +25,6 @@ class PagingGalleryListKeyConstructor(PagingListKeyConstructor): class GalleryListView(ListCreateAPIView): - filter_backends = (filters.SearchFilter, filters.OrderingFilter) search_fields = ("title",) ordering_fields = ("title", "update", "pubdate") @@ -105,7 +104,6 @@ class GalleryDetailKeyConstructor(DetailKeyConstructor): class GalleryDetailView(RetrieveUpdateDestroyAPIView, NoPatchView, GalleryUpdateOrDeleteMixin): - queryset = Gallery.objects.annotated_gallery() list_key_func = GalleryDetailKeyConstructor() @@ -208,7 +206,6 @@ class PagingImageListKeyConstructor(PagingListKeyConstructor): class ImageListView(ListCreateAPIView): - filter_backends = (filters.SearchFilter, filters.OrderingFilter) search_fields = ("title",) ordering_fields = ("title", "update", "pubdate") @@ -307,7 +304,6 @@ class ImageDetailKeyConstructor(DetailKeyConstructor): class ImageDetailView(RetrieveUpdateDestroyAPIView, NoPatchView, ImageUpdateOrDeleteMixin): - queryset = Image.objects list_key_func = ImageDetailKeyConstructor() @@ -413,7 +409,6 @@ class PagingParticipantListKeyConstructor(PagingListKeyConstructor): class ParticipantListView(ListCreateAPIView): - filter_backends = (filters.OrderingFilter,) ordering_fields = ("id",) list_key_func = PagingParticipantListKeyConstructor() @@ -496,7 +491,6 @@ class ParticipantDetailKeyConstructor(DetailKeyConstructor): class ParticipantDetailView(RetrieveUpdateDestroyAPIView, NoPatchView, GalleryUpdateOrDeleteMixin): - list_key_func = ParticipantDetailKeyConstructor() lookup_field = "user__pk" diff --git a/zds/gallery/migrations/0001_initial.py b/zds/gallery/migrations/0001_initial.py index b6d232b419..b21893aa14 100644 --- a/zds/gallery/migrations/0001_initial.py +++ b/zds/gallery/migrations/0001_initial.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] diff --git a/zds/gallery/migrations/0002_auto_20150409_2122.py b/zds/gallery/migrations/0002_auto_20150409_2122.py index c7b4d1ebe3..ca4b263690 100644 --- a/zds/gallery/migrations/0002_auto_20150409_2122.py +++ b/zds/gallery/migrations/0002_auto_20150409_2122.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("gallery", "0001_initial"), ] diff --git a/zds/gallery/migrations/0003_auto_20150928_1249.py b/zds/gallery/migrations/0003_auto_20150928_1249.py index 103a7595aa..177dddc112 100644 --- a/zds/gallery/migrations/0003_auto_20150928_1249.py +++ b/zds/gallery/migrations/0003_auto_20150928_1249.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("gallery", "0002_auto_20150409_2122"), ] diff --git a/zds/gallery/migrations/0004_python_3.py b/zds/gallery/migrations/0004_python_3.py index 0d694717b3..a1f7256f04 100644 --- a/zds/gallery/migrations/0004_python_3.py +++ b/zds/gallery/migrations/0004_python_3.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("gallery", "0003_auto_20150928_1249"), ] diff --git a/zds/gallery/migrations/0005_auto_20180816_2256.py b/zds/gallery/migrations/0005_auto_20180816_2256.py index 3e55f8c056..67873d67a2 100644 --- a/zds/gallery/migrations/0005_auto_20180816_2256.py +++ b/zds/gallery/migrations/0005_auto_20180816_2256.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("gallery", "0004_python_3"), ] diff --git a/zds/gallery/migrations/0006_usergallery_is_default.py b/zds/gallery/migrations/0006_usergallery_is_default.py index d450ce1723..aabe40b963 100644 --- a/zds/gallery/migrations/0006_usergallery_is_default.py +++ b/zds/gallery/migrations/0006_usergallery_is_default.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("gallery", "0005_auto_20180816_2256"), ] diff --git a/zds/gallery/migrations/0007_auto_20191122_1154.py b/zds/gallery/migrations/0007_auto_20191122_1154.py index c6a9ff9853..e58cdd6923 100644 --- a/zds/gallery/migrations/0007_auto_20191122_1154.py +++ b/zds/gallery/migrations/0007_auto_20191122_1154.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("gallery", "0006_usergallery_is_default"), ] diff --git a/zds/gallery/mixins.py b/zds/gallery/mixins.py index 1a532939a7..50f413d034 100644 --- a/zds/gallery/mixins.py +++ b/zds/gallery/mixins.py @@ -196,7 +196,6 @@ def perform_leave(self, user): class ImageMixin(GalleryMixin): - image = None def get_image(self, pk): diff --git a/zds/gallery/tests/tests_forms.py b/zds/gallery/tests/tests_forms.py index f7d31074cd..5f3fb16b72 100644 --- a/zds/gallery/tests/tests_forms.py +++ b/zds/gallery/tests/tests_forms.py @@ -99,7 +99,6 @@ def test_empty_title_image_form(self): upload_file.close() def test_empty_pic_image_form(self): - data = { "title": "Test Title", "legend": "Test Legend", diff --git a/zds/gallery/tests/tests_views.py b/zds/gallery/tests/tests_views.py index be78205026..e52ea5adb6 100644 --- a/zds/gallery/tests/tests_views.py +++ b/zds/gallery/tests/tests_views.py @@ -507,7 +507,6 @@ def test_fail_member_no_permission_can_edit_image(self): self.client.force_login(self.profile3.user) with (settings.BASE_DIR / "fixtures" / "logo.png").open("rb") as fp: - self.client.post( reverse("gallery:image-edit", args=[self.gallery.pk, self.image.pk]), {"title": "modify with no perms", "legend": "test legend", "physical": fp}, diff --git a/zds/gallery/views.py b/zds/gallery/views.py index f50a9aa8ce..c652836063 100644 --- a/zds/gallery/views.py +++ b/zds/gallery/views.py @@ -144,7 +144,6 @@ def get_context_data(self, **kwargs): return context def form_valid(self, form): - self.perform_update( { "title": form.cleaned_data["title"], @@ -157,7 +156,6 @@ def form_valid(self, form): class DeleteGalleries(LoggedWithReadWriteHability, GalleryUpdateOrDeleteMixin, View): - http_method_names = ["post"] def post(self, request, *args, **kwargs): @@ -408,7 +406,6 @@ class DeleteImages(ImageFromGalleryViewMixin, ImageUpdateOrDeleteMixin, LoggedWi must_write = True def delete(self, request, *args, **kwargs): - if "delete_multi" in request.POST: list_items = request.POST.getlist("g_items") Image.objects.filter(pk__in=list_items, gallery=self.gallery).delete() diff --git a/zds/member/forms.py b/zds/member/forms.py index 327b266e34..5120802ab6 100644 --- a/zds/member/forms.py +++ b/zds/member/forms.py @@ -467,7 +467,6 @@ def __init__(self, user, *args, **kwargs): # TODO: Updates the password --> requires a better name class ChangePasswordForm(PasswordRequiredForm): - password_new = forms.CharField( label=_("Nouveau mot de passe"), min_length=MIN_PASSWORD_LENGTH, diff --git a/zds/member/migrations/0001_initial.py b/zds/member/migrations/0001_initial.py index 45e836d31a..2b9ad8e15b 100644 --- a/zds/member/migrations/0001_initial.py +++ b/zds/member/migrations/0001_initial.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] diff --git a/zds/member/migrations/0002_auto_20150601_1144.py b/zds/member/migrations/0002_auto_20150601_1144.py index cc7e9e4043..abc832af65 100644 --- a/zds/member/migrations/0002_auto_20150601_1144.py +++ b/zds/member/migrations/0002_auto_20150601_1144.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0001_initial"), ] diff --git a/zds/member/migrations/0003_auto_20151019_2333.py b/zds/member/migrations/0003_auto_20151019_2333.py index e6c6ffd42b..dcee9b5408 100644 --- a/zds/member/migrations/0003_auto_20151019_2333.py +++ b/zds/member/migrations/0003_auto_20151019_2333.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0002_auto_20150601_1144"), ] diff --git a/zds/member/migrations/0004_profile_allow_temp_visual_changes.py b/zds/member/migrations/0004_profile_allow_temp_visual_changes.py index 22899aedc7..b970fdbdb9 100644 --- a/zds/member/migrations/0004_profile_allow_temp_visual_changes.py +++ b/zds/member/migrations/0004_profile_allow_temp_visual_changes.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0003_auto_20151019_2333"), ] diff --git a/zds/member/migrations/0005_profile_github_token.py b/zds/member/migrations/0005_profile_github_token.py index 90cde409b6..88f6bf844b 100644 --- a/zds/member/migrations/0005_profile_github_token.py +++ b/zds/member/migrations/0005_profile_github_token.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0004_profile_allow_temp_visual_changes"), ] diff --git a/zds/member/migrations/0006_auto_20161119_1650.py b/zds/member/migrations/0006_auto_20161119_1650.py index 072e379daf..04fc86b6de 100644 --- a/zds/member/migrations/0006_auto_20161119_1650.py +++ b/zds/member/migrations/0006_auto_20161119_1650.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0005_profile_github_token"), ] diff --git a/zds/member/migrations/0007_auto_20161119_1836.py b/zds/member/migrations/0007_auto_20161119_1836.py index 66d4a6e91d..02c35aea4b 100644 --- a/zds/member/migrations/0007_auto_20161119_1836.py +++ b/zds/member/migrations/0007_auto_20161119_1836.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0006_auto_20161119_1650"), ] diff --git a/zds/member/migrations/0008_remove_profile_sdz_tutorial.py b/zds/member/migrations/0008_remove_profile_sdz_tutorial.py index 361b20d7e1..b87da11acc 100644 --- a/zds/member/migrations/0008_remove_profile_sdz_tutorial.py +++ b/zds/member/migrations/0008_remove_profile_sdz_tutorial.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0007_auto_20161119_1836"), ] diff --git a/zds/member/migrations/0009_profile_show_staff_badge.py b/zds/member/migrations/0009_profile_show_staff_badge.py index 4c5702b8c7..a181c6e0f6 100644 --- a/zds/member/migrations/0009_profile_show_staff_badge.py +++ b/zds/member/migrations/0009_profile_show_staff_badge.py @@ -18,7 +18,6 @@ def forwards_func(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ("member", "0008_remove_profile_sdz_tutorial"), ] diff --git a/zds/member/migrations/0010_profile_show_markdown_help.py b/zds/member/migrations/0010_profile_show_markdown_help.py index 8e63024e3f..ee80b3a8d9 100644 --- a/zds/member/migrations/0010_profile_show_markdown_help.py +++ b/zds/member/migrations/0010_profile_show_markdown_help.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0009_profile_show_staff_badge"), ] diff --git a/zds/member/migrations/0011_bannedemailprovider_newemailprovider.py b/zds/member/migrations/0011_bannedemailprovider_newemailprovider.py index 2c4d37b31e..1d2577195a 100644 --- a/zds/member/migrations/0011_bannedemailprovider_newemailprovider.py +++ b/zds/member/migrations/0011_bannedemailprovider_newemailprovider.py @@ -827,7 +827,6 @@ def forwards_func(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("member", "0010_profile_show_markdown_help"), diff --git a/zds/member/migrations/0012_profile_licence.py b/zds/member/migrations/0012_profile_licence.py index 83aa6ec441..40be377c68 100644 --- a/zds/member/migrations/0012_profile_licence.py +++ b/zds/member/migrations/0012_profile_licence.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0012_commentedit"), ("member", "0011_bannedemailprovider_newemailprovider"), diff --git a/zds/member/migrations/0013_auto_20170807_1930.py b/zds/member/migrations/0013_auto_20170807_1930.py index 69a01ee9d9..8406979849 100644 --- a/zds/member/migrations/0013_auto_20170807_1930.py +++ b/zds/member/migrations/0013_auto_20170807_1930.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0012_profile_licence"), ] diff --git a/zds/member/migrations/0014_profile_use_old_smileys.py b/zds/member/migrations/0014_profile_use_old_smileys.py index 7d7f7ac488..2fb8692ef0 100644 --- a/zds/member/migrations/0014_profile_use_old_smileys.py +++ b/zds/member/migrations/0014_profile_use_old_smileys.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0013_auto_20170807_1930"), ] diff --git a/zds/member/migrations/0015_auto_20170905_2220.py b/zds/member/migrations/0015_auto_20170905_2220.py index 5a16168906..a648354e83 100644 --- a/zds/member/migrations/0015_auto_20170905_2220.py +++ b/zds/member/migrations/0015_auto_20170905_2220.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0014_auto_20170905_2220"), ("member", "0014_profile_use_old_smileys"), diff --git a/zds/member/migrations/0016_python_3.py b/zds/member/migrations/0016_python_3.py index 78dff8ceaf..15363677da 100644 --- a/zds/member/migrations/0016_python_3.py +++ b/zds/member/migrations/0016_python_3.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0015_auto_20170905_2220"), ] diff --git a/zds/member/migrations/0017_profile_email_for_new_mp.py b/zds/member/migrations/0017_profile_email_for_new_mp.py index 5721b510b2..fef1100738 100644 --- a/zds/member/migrations/0017_profile_email_for_new_mp.py +++ b/zds/member/migrations/0017_profile_email_for_new_mp.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0016_python_3"), ] diff --git a/zds/member/migrations/0018_auto_20190114_1301.py b/zds/member/migrations/0018_auto_20190114_1301.py index ea86c55188..972a4634a8 100644 --- a/zds/member/migrations/0018_auto_20190114_1301.py +++ b/zds/member/migrations/0018_auto_20190114_1301.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0017_profile_email_for_new_mp"), ] diff --git a/zds/member/migrations/0019_profile_username_skeleton.py b/zds/member/migrations/0019_profile_username_skeleton.py index 07d6f3a6da..2b81a80bc7 100644 --- a/zds/member/migrations/0019_profile_username_skeleton.py +++ b/zds/member/migrations/0019_profile_username_skeleton.py @@ -20,7 +20,6 @@ def remove_skeleton(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ("member", "0018_auto_20190114_1301"), ] diff --git a/zds/member/migrations/0020_auto_20201018_0841.py b/zds/member/migrations/0020_auto_20201018_0841.py index 19cb8b4215..421928550f 100644 --- a/zds/member/migrations/0020_auto_20201018_0841.py +++ b/zds/member/migrations/0020_auto_20201018_0841.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0019_profile_username_skeleton"), ] diff --git a/zds/member/migrations/0021_remove_profile_use_old_smileys.py b/zds/member/migrations/0021_remove_profile_use_old_smileys.py index 218faffdb2..48fcd3a91a 100644 --- a/zds/member/migrations/0021_remove_profile_use_old_smileys.py +++ b/zds/member/migrations/0021_remove_profile_use_old_smileys.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0020_auto_20201018_0841"), ] diff --git a/zds/member/migrations/0022_add_hide_forum_activity.py b/zds/member/migrations/0022_add_hide_forum_activity.py index eab7e31e83..fa2e5eeb09 100644 --- a/zds/member/migrations/0022_add_hide_forum_activity.py +++ b/zds/member/migrations/0022_add_hide_forum_activity.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0021_remove_profile_use_old_smileys"), ] diff --git a/zds/member/tests/tests_forms.py b/zds/member/tests/tests_forms.py index 91c4768627..5c0c6ab926 100644 --- a/zds/member/tests/tests_forms.py +++ b/zds/member/tests/tests_forms.py @@ -213,7 +213,6 @@ def test_site_url_with_https_protocol_miniprofile_form(self): self.assertTrue(form.is_valid()) def test_too_long_site_url_miniprofile_form(self): - # url is one char too long data = {"biography": "", "site": stringof2001chars, "avatar_url": "", "sign": ""} form = MiniProfileForm(data=data) diff --git a/zds/member/tests/tests_models.py b/zds/member/tests/tests_models.py index 2f8fb6e135..8f5d0c1532 100644 --- a/zds/member/tests/tests_models.py +++ b/zds/member/tests/tests_models.py @@ -257,7 +257,6 @@ def test_get_active_alerts_count(self): self.assertEqual(self.user1.get_active_alerts_count(), 1) def test_can_read_now(self): - profile = ProfileFactory() profile.is_active = True profile.can_read = True @@ -284,7 +283,6 @@ def test_can_read_now(self): self.assertFalse(self.user1.can_read_now()) def test_can_write_now(self): - self.user1.user.is_active = True self.user1.user.can_write = True self.assertTrue(self.user1.can_write_now()) diff --git a/zds/member/tests/views/tests_moderation.py b/zds/member/tests/views/tests_moderation.py index 2093e6ef06..ebda4d9d94 100644 --- a/zds/member/tests/views/tests_moderation.py +++ b/zds/member/tests/views/tests_moderation.py @@ -301,7 +301,6 @@ def test_sanctions_with_not_staff_user(self): self.assertEqual(result.status_code, 302) def test_failed_bot_sanctions(self): - staff = StaffProfileFactory() self.client.force_login(staff.user) diff --git a/zds/member/tests/views/tests_profile.py b/zds/member/tests/views/tests_profile.py index 8a10b7f741..a19cd05e4f 100644 --- a/zds/member/tests/views/tests_profile.py +++ b/zds/member/tests/views/tests_profile.py @@ -105,7 +105,6 @@ def test_old_detail_member_url_with_unexistant_member(self): self.assertEqual(response.status_code, 404) def test_profile_page_of_weird_member_username(self): - # create some user with weird username user_1 = ProfileFactory() user_2 = ProfileFactory() @@ -147,7 +146,6 @@ def test_modify_member(self): self.assertEqual(result.status_code, 200) def test_success_preview_biography(self): - member = ProfileFactory() self.client.force_login(member.user) diff --git a/zds/member/views/password_recovery.py b/zds/member/views/password_recovery.py index 71a65dd483..4c6dd558c0 100644 --- a/zds/member/views/password_recovery.py +++ b/zds/member/views/password_recovery.py @@ -20,7 +20,6 @@ def forgot_password(request): if request.method == "POST": form = UsernameAndEmailForm(request.POST) if form.is_valid(): - # Get data from form data = form.data username = data["username"] diff --git a/zds/member/views/register.py b/zds/member/views/register.py index ef54006442..5c312ba8c7 100644 --- a/zds/member/views/register.py +++ b/zds/member/views/register.py @@ -101,7 +101,6 @@ class SendValidationEmailView(FormView, TokenGenerator): usr = None def get_user(self, username, email): - if username: self.usr = get_object_or_404(User, username=username) diff --git a/zds/migrations/oauth2_provider/0001_initial.py b/zds/migrations/oauth2_provider/0001_initial.py index 54f283f993..d65e43ac5d 100644 --- a/zds/migrations/oauth2_provider/0001_initial.py +++ b/zds/migrations/oauth2_provider/0001_initial.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] diff --git a/zds/mp/migrations/0001_initial.py b/zds/mp/migrations/0001_initial.py index 37df22ba70..cd30921ec1 100644 --- a/zds/mp/migrations/0001_initial.py +++ b/zds/mp/migrations/0001_initial.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] diff --git a/zds/mp/migrations/0002_auto_20150416_1750.py b/zds/mp/migrations/0002_auto_20150416_1750.py index 29cb416641..76e494da93 100644 --- a/zds/mp/migrations/0002_auto_20150416_1750.py +++ b/zds/mp/migrations/0002_auto_20150416_1750.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("mp", "0001_initial"), ] diff --git a/zds/mp/migrations/0003_privatepost_hat.py b/zds/mp/migrations/0003_privatepost_hat.py index c5ad704662..20e078404a 100644 --- a/zds/mp/migrations/0003_privatepost_hat.py +++ b/zds/mp/migrations/0003_privatepost_hat.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0014_auto_20170905_2220"), ("mp", "0002_auto_20150416_1750"), diff --git a/zds/mp/migrations/0004_python_3.py b/zds/mp/migrations/0004_python_3.py index c901832ad5..81d5aa68e1 100644 --- a/zds/mp/migrations/0004_python_3.py +++ b/zds/mp/migrations/0004_python_3.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("mp", "0003_privatepost_hat"), ] diff --git a/zds/mp/migrations/0005_auto_20190110_1310.py b/zds/mp/migrations/0005_auto_20190110_1310.py index f46b1bcc80..2d8306e3ea 100644 --- a/zds/mp/migrations/0005_auto_20190110_1310.py +++ b/zds/mp/migrations/0005_auto_20190110_1310.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("mp", "0004_python_3"), ] diff --git a/zds/mp/migrations/0006_auto_20190114_1301.py b/zds/mp/migrations/0006_auto_20190114_1301.py index fbf0621257..80fbdae6e9 100644 --- a/zds/mp/migrations/0006_auto_20190114_1301.py +++ b/zds/mp/migrations/0006_auto_20190114_1301.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("mp", "0005_auto_20190110_1310"), ] diff --git a/zds/mp/migrations/0007_add_votes_to_private_post.py b/zds/mp/migrations/0007_add_votes_to_private_post.py index b9f4263328..3c5d1f6b01 100644 --- a/zds/mp/migrations/0007_add_votes_to_private_post.py +++ b/zds/mp/migrations/0007_add_votes_to_private_post.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("mp", "0006_auto_20190114_1301"), diff --git a/zds/mp/tests/tests_utils.py b/zds/mp/tests/tests_utils.py index d049f7ab7e..25cc23a9d9 100644 --- a/zds/mp/tests/tests_utils.py +++ b/zds/mp/tests/tests_utils.py @@ -75,7 +75,6 @@ def test_new_mp_email(self): PrivateTopic.objects.all().delete() def test_answer_mp_email(self): - # Create a MP self.client.post( reverse("mp:create"), diff --git a/zds/mp/tests/tests_views.py b/zds/mp/tests/tests_views.py index f5f9b91f06..ea1f824246 100644 --- a/zds/mp/tests/tests_views.py +++ b/zds/mp/tests/tests_views.py @@ -32,7 +32,6 @@ def test_success_delete_topic_no_participants(self): self.assertEqual(0, PrivateTopic.objects.filter(pk=topic.pk).count()) def test_success_delete_topic_as_author(self): - self.client.force_login(self.profile1.user) response = self.client.post(reverse("mp:list-delete"), {"items": [self.topic1.pk]}) @@ -44,7 +43,6 @@ def test_success_delete_topic_as_author(self): self.assertNotIn(self.profile2.user, topic.participants.all()) def test_success_delete_topic_as_participant(self): - self.client.force_login(self.profile2.user) response = self.client.post(reverse("mp:list-delete"), {"items": [self.topic1.pk]}) @@ -121,7 +119,6 @@ def setUp(self): self.post2 = PrivatePostFactory(privatetopic=self.topic1, author=self.profile2.user, position_in_topic=2) def test_fail_topic_no_exist(self): - self.client.force_login(self.profile1.user) response = self.client.get(reverse("mp:view", args=[12, "private-topic"])) @@ -230,14 +227,12 @@ def setUp(self): self.client.force_login(self.profile1.user) def test_denies_anonymous(self): - self.client.logout() response = self.client.get(reverse("mp:create"), follow=True) self.assertRedirects(response, reverse("member-login") + "?next=" + reverse("mp:create")) def test_success_get_with_and_without_username(self): - response = self.client.get(reverse("mp:create")) self.assertEqual(200, response.status_code) @@ -249,7 +244,6 @@ def test_success_get_with_and_without_username(self): self.assertEqual(self.profile2.user.username, response2.context["form"].initial["participants"]) def test_success_get_with_multi_username(self): - profile3 = ProfileFactory() response = self.client.get( @@ -263,7 +257,6 @@ def test_success_get_with_multi_username(self): self.assertTrue(profile3.user.username in response.context["form"].initial["participants"]) def test_success_get_with_and_without_title(self): - response = self.client.get(reverse("mp:create")) self.assertEqual(200, response.status_code) @@ -275,14 +268,12 @@ def test_success_get_with_and_without_title(self): self.assertEqual("Test titre", response2.context["form"].initial["title"]) def test_fail_get_with_username_not_exist(self): - response2 = self.client.get(reverse("mp:create") + "?username=wrongusername") self.assertEqual(200, response2.status_code) self.assertEqual(response2.context["form"].initial["participants"], "") def test_success_preview(self): - self.assertEqual(0, PrivateTopic.objects.all().count()) response = self.client.post( reverse("mp:create"), @@ -299,7 +290,6 @@ def test_success_preview(self): self.assertEqual(0, PrivateTopic.objects.all().count()) def test_fail_new_topic_user_no_exist(self): - self.assertEqual(0, PrivateTopic.objects.all().count()) response = self.client.post( reverse("mp:create"), @@ -310,7 +300,6 @@ def test_fail_new_topic_user_no_exist(self): self.assertEqual(0, PrivateTopic.objects.all().count()) def test_fail_new_topic_user_no_active(self): - profile_inactive = ProfileFactory() profile_inactive.user.is_active = False profile_inactive.user.save() @@ -330,7 +319,6 @@ def test_fail_new_topic_user_no_active(self): self.assertEqual(0, PrivateTopic.objects.all().count()) def test_success_new_topic(self): - self.assertEqual(0, PrivateTopic.objects.all().count()) response = self.client.post( reverse("mp:create"), @@ -358,7 +346,6 @@ def test_new_topic_with_hat(self): self.assertEqual(PrivatePost.objects.latest("pubdate").hat, self.hat) def test_fail_new_topic_user_add_only_himself(self): - self.assertEqual(0, PrivateTopic.objects.all().count()) response = self.client.post( reverse("mp:create"), @@ -370,7 +357,6 @@ def test_fail_new_topic_user_add_only_himself(self): self.assertEqual(0, PrivateTopic.objects.all().count()) def test_fail_new_topic_user_add_himself_and_others(self): - self.assertEqual(0, PrivateTopic.objects.all().count()) participants = self.profile2.user.username @@ -404,7 +390,6 @@ def setUp(self): self.client.force_login(self.profile1.user) def test_denies_anonymous(self): - self.client.logout() response = self.client.get(reverse("mp:answer", args=[1, "private-topic"]), follow=True) @@ -413,19 +398,16 @@ def test_denies_anonymous(self): ) def test_fail_answer_not_send_topic_pk(self): - response = self.client.post(reverse("mp:answer", args=[999, "private-topic"])) self.assertEqual(404, response.status_code) def test_fail_answer_topic_no_exist(self): - response = self.client.post(reverse("mp:answer", args=[156, "private-topic"])) self.assertEqual(404, response.status_code) def test_fail_cite_post_no_exist(self): - response = self.client.get(reverse("mp:answer", args=[self.topic1.pk, self.topic1.slug()]) + "&cite=4864") self.assertEqual(404, response.status_code) @@ -446,7 +428,6 @@ def test_fail_cite_weird_pk(self): self.assertEqual(404, response.status_code) def test_success_cite_post(self): - response = self.client.get( reverse("mp:answer", args=[self.topic1.pk, self.topic1.slug()]) + f"?cite={self.post2.pk}" ) @@ -454,7 +435,6 @@ def test_success_cite_post(self): self.assertEqual(200, response.status_code) def test_success_preview_answer(self): - response = self.client.post( reverse("mp:answer", args=[self.topic1.pk, self.topic1.slug()]), {"text": "answer", "preview": "", "last_post": self.topic1.last_message.pk}, @@ -464,7 +444,6 @@ def test_success_preview_answer(self): self.assertEqual(200, response.status_code) def test_success_answer(self): - response = self.client.post( reverse("mp:answer", args=[self.topic1.pk, self.topic1.slug()]), {"text": "Bonjour Luc", "last_post": self.topic1.last_message.pk}, @@ -490,7 +469,6 @@ def test_answer_with_hat(self): self.assertEqual(PrivatePost.objects.latest("pubdate").hat, self.hat) def test_fail_answer_with_no_right(self): - self.client.logout() self.client.force_login(self.profile3.user) @@ -546,7 +524,6 @@ def setUp(self): self.client.force_login(self.profile1.user) def test_denies_anonymous(self): - self.client.logout() response = self.client.get(reverse("mp:post-edit", args=[1]), follow=True) @@ -564,7 +541,6 @@ def test_succes_get_edit_post_page(self): self.assertEqual(200, response.status_code) def test_fail_edit_post_no_exist(self): - response = self.client.get(reverse("mp:post-edit", args=[154])) self.assertEqual(404, response.status_code) @@ -580,7 +556,6 @@ def test_fail_edit_post_with_no_right(self): self.assertEqual(403, response.status_code) def test_success_edit_post(self): - self.client.logout() self.client.force_login(self.profile2.user) @@ -643,7 +618,6 @@ def setUp(self): self.client.force_login(self.profile1.user) def test_denies_anonymous(self): - self.client.logout() response = self.client.get(reverse("mp:leave", args=[1, "private-topic"]), follow=True) @@ -660,13 +634,11 @@ def test_denies_leave_topic_as_random_member(self): self.assertEqual(1, PrivateTopic.objects.filter(pk=self.topic1.pk).count()) def test_fail_leave_topic_no_exist(self): - response = self.client.post(reverse("mp:leave", args=[999, "private-topic"])) self.assertEqual(404, response.status_code) def test_success_leave_topic_as_author_no_participants(self): - self.topic1.participants.clear() self.topic1.save() @@ -676,7 +648,6 @@ def test_success_leave_topic_as_author_no_participants(self): self.assertEqual(0, PrivateTopic.objects.filter(pk=self.topic1.pk).all().count()) def test_success_leave_topic_as_author(self): - response = self.client.post(reverse("mp:leave", args=[self.topic1.pk, self.topic1.slug()]), follow=True) self.assertEqual(200, response.status_code) @@ -685,7 +656,6 @@ def test_success_leave_topic_as_author(self): self.assertEqual(self.profile2.user, PrivateTopic.objects.get(pk=self.topic1.pk).author) def test_success_leave_topic_as_participant(self): - self.client.logout() self.client.force_login(self.profile2.user) @@ -717,7 +687,6 @@ def setUp(self): self.client.force_login(self.profile1.user) def test_denies_anonymous(self): - self.client.logout() response = self.client.get(reverse("mp:edit-participant", args=[1, "private-topic"]), follow=True) @@ -726,7 +695,6 @@ def test_denies_anonymous(self): ) def test_fail_add_participant_topic_no_exist(self): - response = self.client.post(reverse("mp:edit-participant", args=[451, "private-topic"]), follow=True) self.assertEqual(404, response.status_code) @@ -745,7 +713,6 @@ def test_test_fail_add_bot_as_participant(self): self.assertFalse(self.anonymous_account in self.topic1.participants.all()) def test_fail_add_participant_who_no_exist(self): - response = self.client.post( reverse("mp:edit-participant", args=[self.topic1.pk, self.topic1.slug()]), {"username": "178548"}, @@ -770,7 +737,6 @@ def test_fail_add_participant_with_no_right(self): self.assertNotIn(profile3.user, PrivateTopic.objects.get(pk=self.topic1.pk).participants.all()) def test_fail_add_participant_already_in(self): - response = self.client.post( reverse("mp:edit-participant", args=[self.topic1.pk, self.topic1.slug()]), {"username": self.profile2.user.username}, @@ -781,7 +747,6 @@ def test_fail_add_participant_already_in(self): self.assertEqual(1, len(response.context["messages"])) def test_success_add_participant(self): - profile3 = ProfileFactory() response = self.client.post( @@ -806,7 +771,6 @@ def setUp(self): self.post2 = PrivatePostFactory(privatetopic=self.topic1, author=self.profile2.user, position_in_topic=2) def test_denies_anonymous(self): - self.client.logout() self.topic1.title = "super title" self.topic1.subtitle = "super subtitle" @@ -852,7 +816,6 @@ def test_success_edit_topic(self): self.assertEqual("subtest", topic.subtitle) def test_fail_user_is_not_author(self): - self.topic1.title = "super title" self.topic1.subtitle = "super subtitle" self.topic1.save() @@ -888,7 +851,6 @@ def test_fail_topic_doesnt_exist(self): self.assertEqual(404, response.status_code) def test_fail_blank_title(self): - self.topic1.title = "super title" self.topic1.subtitle = "super subtitle" self.topic1.save() diff --git a/zds/notification/migrations/0001_initial.py b/zds/notification/migrations/0001_initial.py index a4e2bf6b0e..0293a8e535 100644 --- a/zds/notification/migrations/0001_initial.py +++ b/zds/notification/migrations/0001_initial.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0005_auto_20151119_2224"), ] diff --git a/zds/notification/migrations/0002_auto_20151219_2302.py b/zds/notification/migrations/0002_auto_20151219_2302.py index 3bb79bbfd3..524353b139 100644 --- a/zds/notification/migrations/0002_auto_20151219_2302.py +++ b/zds/notification/migrations/0002_auto_20151219_2302.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("contenttypes", "0001_initial"), ("member", "0004_profile_allow_temp_visual_changes"), diff --git a/zds/notification/migrations/0004_auto_20160110_1221.py b/zds/notification/migrations/0004_auto_20160110_1221.py index 336b0701ab..cac76d44ba 100644 --- a/zds/notification/migrations/0004_auto_20160110_1221.py +++ b/zds/notification/migrations/0004_auto_20160110_1221.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0003_auto_20160103_0001"), ] diff --git a/zds/notification/migrations/0005_auto_20160111_1936.py b/zds/notification/migrations/0005_auto_20160111_1936.py index 3ca25d3ba6..bd8502a7a9 100644 --- a/zds/notification/migrations/0005_auto_20160111_1936.py +++ b/zds/notification/migrations/0005_auto_20160111_1936.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0004_auto_20160110_1221"), ] diff --git a/zds/notification/migrations/0006_auto_20160115_1724.py b/zds/notification/migrations/0006_auto_20160115_1724.py index d6b1a65181..b577e423cd 100644 --- a/zds/notification/migrations/0006_auto_20160115_1724.py +++ b/zds/notification/migrations/0006_auto_20160115_1724.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0005_auto_20160111_1936"), ] diff --git a/zds/notification/migrations/0007_auto_20160121_2343.py b/zds/notification/migrations/0007_auto_20160121_2343.py index 0e8fee27bc..e2e72ed843 100644 --- a/zds/notification/migrations/0007_auto_20160121_2343.py +++ b/zds/notification/migrations/0007_auto_20160121_2343.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("notification", "0006_auto_20160115_1724"), diff --git a/zds/notification/migrations/0008_auto_20160507_1504.py b/zds/notification/migrations/0008_auto_20160507_1504.py index 8a73b34921..4bc4e07cf2 100644 --- a/zds/notification/migrations/0008_auto_20160507_1504.py +++ b/zds/notification/migrations/0008_auto_20160507_1504.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0007_auto_20160121_2343"), ] diff --git a/zds/notification/migrations/0009_newtopicsubscription.py b/zds/notification/migrations/0009_newtopicsubscription.py index 82e81ee68b..f4f8f7b69e 100644 --- a/zds/notification/migrations/0009_newtopicsubscription.py +++ b/zds/notification/migrations/0009_newtopicsubscription.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0008_auto_20160507_1504"), ] diff --git a/zds/notification/migrations/0010_newpublicationsubscription.py b/zds/notification/migrations/0010_newpublicationsubscription.py index a5599e3484..04693ba314 100644 --- a/zds/notification/migrations/0010_newpublicationsubscription.py +++ b/zds/notification/migrations/0010_newpublicationsubscription.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0009_newtopicsubscription"), ] diff --git a/zds/notification/migrations/0011_notification_is_dead.py b/zds/notification/migrations/0011_notification_is_dead.py index 0764fc81f6..78fee9b777 100644 --- a/zds/notification/migrations/0011_notification_is_dead.py +++ b/zds/notification/migrations/0011_notification_is_dead.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0010_newpublicationsubscription"), ] diff --git a/zds/notification/migrations/0012_auto_20160703_2255.py b/zds/notification/migrations/0012_auto_20160703_2255.py index 5d6d12249d..32ac66e3a4 100644 --- a/zds/notification/migrations/0012_auto_20160703_2255.py +++ b/zds/notification/migrations/0012_auto_20160703_2255.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0011_notification_is_dead"), ] diff --git a/zds/notification/migrations/0013_clean_notifications.py b/zds/notification/migrations/0013_clean_notifications.py index 105caa3f26..49317fc5cd 100644 --- a/zds/notification/migrations/0013_clean_notifications.py +++ b/zds/notification/migrations/0013_clean_notifications.py @@ -10,7 +10,6 @@ def cleanup(apps, *_): class Migration(migrations.Migration): - dependencies = [ ("notification", "0012_auto_20160703_2255"), ] diff --git a/zds/notification/migrations/0014_pingsubscription.py b/zds/notification/migrations/0014_pingsubscription.py index 958eb4f6f8..a559db6143 100644 --- a/zds/notification/migrations/0014_pingsubscription.py +++ b/zds/notification/migrations/0014_pingsubscription.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0013_clean_notifications"), ] diff --git a/zds/notification/migrations/0015_python_3.py b/zds/notification/migrations/0015_python_3.py index bd7568b1ae..cc565888c0 100644 --- a/zds/notification/migrations/0015_python_3.py +++ b/zds/notification/migrations/0015_python_3.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0014_pingsubscription"), ] diff --git a/zds/notification/migrations/0016_auto_20190114_1301.py b/zds/notification/migrations/0016_auto_20190114_1301.py index 820f0d434c..2e33f90970 100644 --- a/zds/notification/migrations/0016_auto_20190114_1301.py +++ b/zds/notification/migrations/0016_auto_20190114_1301.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("notification", "0015_python_3"), ] diff --git a/zds/notification/migrations/0017_clean_notifications_new_topic_forums_groups.py b/zds/notification/migrations/0017_clean_notifications_new_topic_forums_groups.py index 76267b56f4..55e47c9550 100644 --- a/zds/notification/migrations/0017_clean_notifications_new_topic_forums_groups.py +++ b/zds/notification/migrations/0017_clean_notifications_new_topic_forums_groups.py @@ -16,7 +16,6 @@ def cleanup(apps, *_): class Migration(migrations.Migration): - dependencies = [ ("notification", "0016_auto_20190114_1301"), ] diff --git a/zds/notification/receivers.py b/zds/notification/receivers.py index 4cfec65105..4112797612 100644 --- a/zds/notification/receivers.py +++ b/zds/notification/receivers.py @@ -40,7 +40,6 @@ def remove_group_subscription_on_quitting_groups(*, sender, instance, action, pk if action not in ("pre_clear", "pre_remove"): # only on updating return if action == "pre_clear": - remove_group_subscription_on_quitting_groups( sender=sender, instance=instance, diff --git a/zds/notification/tests/tests_tricky.py b/zds/notification/tests/tests_tricky.py index efa2e2802e..c3b1f66e6d 100644 --- a/zds/notification/tests/tests_tricky.py +++ b/zds/notification/tests/tests_tricky.py @@ -426,7 +426,6 @@ def test_no_more_topic_answer_notif_on_losing_one_group(self): @override_for_contents() class ContentNotification(TestCase, TutorialTestMixin): def setUp(self): - # don't build PDF to speed up the tests self.user1 = ProfileFactory().user self.user2 = ProfileFactory().user diff --git a/zds/pages/migrations/0001_initial.py b/zds/pages/migrations/0001_initial.py index cf661149cc..08215b140a 100644 --- a/zds/pages/migrations/0001_initial.py +++ b/zds/pages/migrations/0001_initial.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("auth", "0006_require_contenttypes_0002"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), diff --git a/zds/pages/migrations/0002_auto_20170831_1023.py b/zds/pages/migrations/0002_auto_20170831_1023.py index ad8ad786a8..eac7c20354 100644 --- a/zds/pages/migrations/0002_auto_20170831_1023.py +++ b/zds/pages/migrations/0002_auto_20170831_1023.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("pages", "0001_initial"), diff --git a/zds/pages/migrations/0003_python_3.py b/zds/pages/migrations/0003_python_3.py index 6a43ef9325..312a9dd328 100644 --- a/zds/pages/migrations/0003_python_3.py +++ b/zds/pages/migrations/0003_python_3.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("pages", "0002_auto_20170831_1023"), ] diff --git a/zds/searchv2/forms.py b/zds/searchv2/forms.py index 560b9a1dd6..5565bf1ec5 100644 --- a/zds/searchv2/forms.py +++ b/zds/searchv2/forms.py @@ -34,7 +34,6 @@ class SearchForm(forms.Form): from_library = forms.CharField(widget=forms.HiddenInput, required=False) def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) self.helper = FormHelper() diff --git a/zds/searchv2/management/commands/es_manager.py b/zds/searchv2/management/commands/es_manager.py index 368b4dc01b..9f47634456 100644 --- a/zds/searchv2/management/commands/es_manager.py +++ b/zds/searchv2/management/commands/es_manager.py @@ -30,7 +30,6 @@ def add_arguments(self, parser): ) def handle(self, *args, **options): - if options["action"] == "setup": self.setup_es() elif options["action"] == "clear": @@ -43,7 +42,6 @@ def handle(self, *args, **options): raise CommandError("unknown action {}".format(options["action"])) def setup_es(self): - self.index_manager.reset_es_index(self.models) self.index_manager.setup_custom_analyzer() @@ -56,7 +54,6 @@ def clear_es(self): self.index_manager.clear_indexing_of_model(model) def index_documents(self, force_reindexing=False): - if force_reindexing: self.setup_es() # remove all previous data diff --git a/zds/searchv2/tests/tests_models.py b/zds/searchv2/tests/tests_models.py index 53bf41e91c..94262be4eb 100644 --- a/zds/searchv2/tests/tests_models.py +++ b/zds/searchv2/tests/tests_models.py @@ -16,7 +16,6 @@ @override_for_contents(ES_ENABLED=True, ES_SEARCH_INDEX={"name": "zds_search_test", "shards": 5, "replicas": 0}) class ESIndexManagerTests(TutorialTestMixin, TestCase): def setUp(self): - settings.EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" self.mas = ProfileFactory().user settings.ZDS_APP["member"]["bot_account"] = self.mas.username diff --git a/zds/searchv2/tests/tests_utils.py b/zds/searchv2/tests/tests_utils.py index 4b3ce0d93a..2a99f3e14a 100644 --- a/zds/searchv2/tests/tests_utils.py +++ b/zds/searchv2/tests/tests_utils.py @@ -18,7 +18,6 @@ @override_for_contents(ES_ENABLED=True, ES_SEARCH_INDEX={"name": "zds_search_test", "shards": 5, "replicas": 0}) class UtilsTests(TutorialTestMixin, TestCase): def setUp(self): - settings.EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" self.mas = ProfileFactory().user settings.ZDS_APP["member"]["bot_account"] = self.mas.username diff --git a/zds/searchv2/tests/tests_views.py b/zds/searchv2/tests/tests_views.py index ac263fac2f..8e906a9098 100644 --- a/zds/searchv2/tests/tests_views.py +++ b/zds/searchv2/tests/tests_views.py @@ -29,7 +29,6 @@ @override_for_contents(ES_ENABLED=True, ES_SEARCH_INDEX={"name": "zds_search_test", "shards": 1, "replicas": 0}) class ViewsTests(TutorialTestMixin, TestCase): def setUp(self): - settings.EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" self.mas = ProfileFactory().user settings.ZDS_APP["member"]["bot_account"] = self.mas.username @@ -547,7 +546,6 @@ def test_boosts(self): # NOTE: score are NOT the same for all documents, no matter how hard it tries to, small differences exists for model in self.indexable: - # set a huge number to overcome the small differences: settings.ZDS_APP["search"]["boosts"][model.get_es_document_type()]["global"] = 10.0 @@ -562,7 +560,6 @@ def test_boosts(self): settings.ZDS_APP["search"]["boosts"][model.get_es_document_type()]["global"] = 1.0 def test_change_topic_impacts_posts(self): - if not self.manager.connected_to_es: return @@ -651,7 +648,6 @@ def test_change_topic_impacts_posts(self): self.assertEqual(response.hits.total, 0) # ok def test_change_publishedcontents_impacts_chapter(self): - if not self.manager.connected_to_es: return @@ -740,7 +736,6 @@ def test_change_publishedcontents_impacts_chapter(self): self.assertEqual(chapters[0].meta.id, published.content_public_slug + "__" + chapter2.slug) # got new chapter def test_opensearch(self): - result = self.client.get(reverse("search:opensearch"), follow=False) self.assertEqual(result.status_code, 200) diff --git a/zds/searchv2/views.py b/zds/searchv2/views.py index a4fbcda244..e78c9f7c43 100644 --- a/zds/searchv2/views.py +++ b/zds/searchv2/views.py @@ -173,7 +173,6 @@ def get_queryset(self): return [] if self.search_query: - # Searches forums the user is allowed to visit self.authorized_forums = get_authorized_forums(self.request.user) diff --git a/zds/settings/abstract_base/config.py b/zds/settings/abstract_base/config.py index a1adcae4e8..279e430e4f 100644 --- a/zds/settings/abstract_base/config.py +++ b/zds/settings/abstract_base/config.py @@ -25,7 +25,6 @@ key = "ensure_settings_module" if key in config and config[key] != django_setting: - raise Exception( ( "The DJANGO_SETTINGS_MODULE environment variable is different than " diff --git a/zds/tutorialv2/forms.py b/zds/tutorialv2/forms.py index b13c688a32..a83afa97b0 100644 --- a/zds/tutorialv2/forms.py +++ b/zds/tutorialv2/forms.py @@ -48,7 +48,6 @@ def label_from_instance(self, obj): class ContributionForm(forms.Form): - contribution_role = ReviewerTypeModelChoiceField( label=_("Role"), required=True, @@ -102,7 +101,6 @@ def clean_username(self): class RemoveContributionForm(forms.Form): - pk_contribution = forms.CharField( label=_("Contributeur"), required=True, @@ -110,7 +108,6 @@ class RemoveContributionForm(forms.Form): class AuthorForm(forms.Form): - username = forms.CharField(label=_("Auteurs à ajouter séparés d'une virgule."), required=True) def __init__(self, *args, **kwargs): @@ -168,7 +165,6 @@ def clean_username(self): class ContainerForm(FormWithTitle): - introduction = forms.CharField( label=_("Introduction"), required=False, @@ -230,7 +226,6 @@ def __init__(self, *args, **kwargs): class ContentForm(ContainerForm): - description = forms.CharField( label=_("Description"), max_length=PublishableContent._meta.get_field("description").max_length, @@ -416,7 +411,6 @@ def _create_layout(self): class ExtractForm(FormWithTitle): - text = forms.CharField( label=_("Texte"), required=False, @@ -448,7 +442,6 @@ def __init__(self, *args, **kwargs): class ImportForm(forms.Form): - file = forms.FileField(label=_("Sélectionnez le contenu à importer."), required=True) images = forms.FileField(label=_("Fichier zip contenant les images du contenu."), required=False) @@ -487,7 +480,6 @@ def clean(self): class ImportContentForm(forms.Form): - archive = forms.FileField(label=_("Sélectionnez l'archive de votre contenu."), required=True) image_archive = forms.FileField(label=_("Sélectionnez l'archive des images."), required=False) @@ -539,7 +531,6 @@ def clean(self): class ImportNewContentForm(ImportContentForm): - subcategory = forms.ModelMultipleChoiceField( label=_( "Sous catégories de votre contenu. Si aucune catégorie ne convient " @@ -674,7 +665,6 @@ def __init__(self, *args, **kwargs): class AskValidationForm(forms.Form): - text = forms.CharField( label="", required=False, @@ -752,7 +742,6 @@ def clean(self): class AcceptValidationForm(forms.Form): - validation = None text = forms.CharField( @@ -799,7 +788,6 @@ def __init__(self, validation, *args, **kwargs): class CancelValidationForm(forms.Form): - text = forms.CharField( label="", required=True, @@ -849,7 +837,6 @@ def clean(self): class RejectValidationForm(forms.Form): - text = forms.CharField( label="", required=True, @@ -903,7 +890,6 @@ def clean(self): class RevokeValidationForm(forms.Form): - version = forms.CharField(widget=forms.HiddenInput()) text = forms.CharField( @@ -949,7 +935,6 @@ def clean(self): class JsFiddleActivationForm(forms.Form): - js_support = forms.BooleanField(label="À cocher pour activer JSFiddle.", required=False, initial=True) def __init__(self, *args, **kwargs): @@ -980,7 +965,6 @@ def clean(self): class MoveElementForm(forms.Form): - child_slug = forms.HiddenInput() container_slug = forms.HiddenInput() first_level_slug = forms.HiddenInput() @@ -1006,7 +990,6 @@ def __init__(self, *args, **kwargs): class WarnTypoForm(forms.Form): - text = forms.CharField( label="", required=True, @@ -1149,7 +1132,6 @@ def clean(self): class UnpublicationForm(forms.Form): - version = forms.CharField(widget=forms.HiddenInput()) text = forms.CharField( @@ -1181,7 +1163,6 @@ def __init__(self, content, *args, **kwargs): class PickOpinionForm(forms.Form): - version = forms.CharField(widget=forms.HiddenInput()) def __init__(self, content, *args, **kwargs): @@ -1245,7 +1226,6 @@ def is_valid(self): class UnpickOpinionForm(forms.Form): - version = forms.CharField(widget=forms.HiddenInput()) text = forms.CharField( @@ -1274,7 +1254,6 @@ def __init__(self, content, *args, **kwargs): class PromoteOpinionToArticleForm(forms.Form): - version = forms.CharField(widget=forms.HiddenInput()) def __init__(self, content, *args, **kwargs): @@ -1351,7 +1330,6 @@ def __init__(self, content, *args, **kwargs): class RemoveSuggestionForm(forms.Form): - pk_suggestion = forms.IntegerField( label=_("Suggestion"), required=True, diff --git a/zds/tutorialv2/management/commands/adjust_slugs.py b/zds/tutorialv2/management/commands/adjust_slugs.py index 93b1ce40a8..afd485a0eb 100644 --- a/zds/tutorialv2/management/commands/adjust_slugs.py +++ b/zds/tutorialv2/management/commands/adjust_slugs.py @@ -13,7 +13,6 @@ class Command(BaseCommand): """ def handle(self, *args, **options): - for c in PublishableContent.objects.all(): if "'" in c.title: good_slug = slugify(c.title) diff --git a/zds/tutorialv2/management/commands/migrate_to_zep25.py b/zds/tutorialv2/management/commands/migrate_to_zep25.py index ac937b7aef..dcf16e63f1 100644 --- a/zds/tutorialv2/management/commands/migrate_to_zep25.py +++ b/zds/tutorialv2/management/commands/migrate_to_zep25.py @@ -14,7 +14,6 @@ @transaction.atomic class Command(BaseCommand): - help = ( "Change all content categories to tags (ZEP-25).\n\n\nOptions:\n\n No options run all commands (except he" "lp) in this order : tags, categories, alert, prod\n\n alert Send a private message to all author" diff --git a/zds/tutorialv2/migrations/0001_initial.py b/zds/tutorialv2/migrations/0001_initial.py index f07e0ed655..d5daabddcb 100644 --- a/zds/tutorialv2/migrations/0001_initial.py +++ b/zds/tutorialv2/migrations/0001_initial.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("forum", "0002_auto_20150410_1505"), ("gallery", "0001_initial"), diff --git a/zds/tutorialv2/migrations/0002_auto_20150417_0445.py b/zds/tutorialv2/migrations/0002_auto_20150417_0445.py index 4eb33940f2..739b83b4fb 100644 --- a/zds/tutorialv2/migrations/0002_auto_20150417_0445.py +++ b/zds/tutorialv2/migrations/0002_auto_20150417_0445.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0001_initial"), ] diff --git a/zds/tutorialv2/migrations/0003_auto_20150423_1429.py b/zds/tutorialv2/migrations/0003_auto_20150423_1429.py index 62172cb4b7..07ded43942 100644 --- a/zds/tutorialv2/migrations/0003_auto_20150423_1429.py +++ b/zds/tutorialv2/migrations/0003_auto_20150423_1429.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0002_auto_20150417_0445"), ] diff --git a/zds/tutorialv2/migrations/0004_publishablecontent_public_version.py b/zds/tutorialv2/migrations/0004_publishablecontent_public_version.py index d8b032889f..5ab261a10e 100644 --- a/zds/tutorialv2/migrations/0004_publishablecontent_public_version.py +++ b/zds/tutorialv2/migrations/0004_publishablecontent_public_version.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0003_auto_20150423_1429"), ] diff --git a/zds/tutorialv2/migrations/0005_auto_20150510_2114.py b/zds/tutorialv2/migrations/0005_auto_20150510_2114.py index e2fb89dc63..27d9d1ea7b 100644 --- a/zds/tutorialv2/migrations/0005_auto_20150510_2114.py +++ b/zds/tutorialv2/migrations/0005_auto_20150510_2114.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0004_publishablecontent_public_version"), ] diff --git a/zds/tutorialv2/migrations/0006_publishablecontent_must_reindex.py b/zds/tutorialv2/migrations/0006_publishablecontent_must_reindex.py index 951b0777f0..0002f6905c 100644 --- a/zds/tutorialv2/migrations/0006_publishablecontent_must_reindex.py +++ b/zds/tutorialv2/migrations/0006_publishablecontent_must_reindex.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0005_auto_20150510_2114"), ] diff --git a/zds/tutorialv2/migrations/0007_auto_20150803_1059.py b/zds/tutorialv2/migrations/0007_auto_20150803_1059.py index 6f24282e38..c1b89790b8 100644 --- a/zds/tutorialv2/migrations/0007_auto_20150803_1059.py +++ b/zds/tutorialv2/migrations/0007_auto_20150803_1059.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0006_publishablecontent_must_reindex"), ] diff --git a/zds/tutorialv2/migrations/0008_publishedcontent_update_date.py b/zds/tutorialv2/migrations/0008_publishedcontent_update_date.py index 60c1cb1974..fc7633dac5 100644 --- a/zds/tutorialv2/migrations/0008_publishedcontent_update_date.py +++ b/zds/tutorialv2/migrations/0008_publishedcontent_update_date.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0007_auto_20150803_1059"), ] diff --git a/zds/tutorialv2/migrations/0009_publishedcontent_authors.py b/zds/tutorialv2/migrations/0009_publishedcontent_authors.py index 34b1ea5d26..35210ffa4d 100644 --- a/zds/tutorialv2/migrations/0009_publishedcontent_authors.py +++ b/zds/tutorialv2/migrations/0009_publishedcontent_authors.py @@ -11,7 +11,6 @@ def put_authors(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("tutorialv2", "0008_publishedcontent_update_date"), diff --git a/zds/tutorialv2/migrations/0010_publishedcontent_sizes.py b/zds/tutorialv2/migrations/0010_publishedcontent_sizes.py index f89ed11fdc..0e4acb2175 100644 --- a/zds/tutorialv2/migrations/0010_publishedcontent_sizes.py +++ b/zds/tutorialv2/migrations/0010_publishedcontent_sizes.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0009_publishedcontent_authors"), ] diff --git a/zds/tutorialv2/migrations/0011_auto_20160106_2231.py b/zds/tutorialv2/migrations/0011_auto_20160106_2231.py index 6a17e54444..1ea4cdedba 100644 --- a/zds/tutorialv2/migrations/0011_auto_20160106_2231.py +++ b/zds/tutorialv2/migrations/0011_auto_20160106_2231.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0010_publishedcontent_sizes"), ] diff --git a/zds/tutorialv2/migrations/0012_publishablecontent_tags.py b/zds/tutorialv2/migrations/0012_publishablecontent_tags.py index 537d36344d..9c3d1b34bf 100644 --- a/zds/tutorialv2/migrations/0012_publishablecontent_tags.py +++ b/zds/tutorialv2/migrations/0012_publishablecontent_tags.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0001_initial"), ("tutorialv2", "0011_auto_20160106_2231"), diff --git a/zds/tutorialv2/migrations/0013_auto_20160320_0908.py b/zds/tutorialv2/migrations/0013_auto_20160320_0908.py index d598862b2e..2a08fc7818 100644 --- a/zds/tutorialv2/migrations/0013_auto_20160320_0908.py +++ b/zds/tutorialv2/migrations/0013_auto_20160320_0908.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0012_publishablecontent_tags"), ] diff --git a/zds/tutorialv2/migrations/0014_auto_20160331_0415.py b/zds/tutorialv2/migrations/0014_auto_20160331_0415.py index 7116452c5d..f121435a63 100644 --- a/zds/tutorialv2/migrations/0014_auto_20160331_0415.py +++ b/zds/tutorialv2/migrations/0014_auto_20160331_0415.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0013_auto_20160320_0908"), ] diff --git a/zds/tutorialv2/migrations/0015_publishedcontent_nb_letter.py b/zds/tutorialv2/migrations/0015_publishedcontent_nb_letter.py index f517a70a54..1944eeb6e3 100644 --- a/zds/tutorialv2/migrations/0015_publishedcontent_nb_letter.py +++ b/zds/tutorialv2/migrations/0015_publishedcontent_nb_letter.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0014_auto_20160331_0415"), ] diff --git a/zds/tutorialv2/migrations/0016_auto_20170201_1940.py b/zds/tutorialv2/migrations/0016_auto_20170201_1940.py index d90a25e793..d446d89bd3 100644 --- a/zds/tutorialv2/migrations/0016_auto_20170201_1940.py +++ b/zds/tutorialv2/migrations/0016_auto_20170201_1940.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0015_publishedcontent_nb_letter"), ] diff --git a/zds/tutorialv2/migrations/0017_auto_20170204_2239.py b/zds/tutorialv2/migrations/0017_auto_20170204_2239.py index 3f5af62d02..7a4d7717f1 100644 --- a/zds/tutorialv2/migrations/0017_auto_20170204_2239.py +++ b/zds/tutorialv2/migrations/0017_auto_20170204_2239.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0016_auto_20170201_1940"), ] diff --git a/zds/tutorialv2/migrations/0018_publishedcontent_is_obsolete.py b/zds/tutorialv2/migrations/0018_publishedcontent_is_obsolete.py index fa41b88790..aa357c1810 100644 --- a/zds/tutorialv2/migrations/0018_publishedcontent_is_obsolete.py +++ b/zds/tutorialv2/migrations/0018_publishedcontent_is_obsolete.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0017_auto_20170204_2239"), ] diff --git a/zds/tutorialv2/migrations/0019_auto_20170208_1347.py b/zds/tutorialv2/migrations/0019_auto_20170208_1347.py index 8e8a9536b2..5736caf3ce 100644 --- a/zds/tutorialv2/migrations/0019_auto_20170208_1347.py +++ b/zds/tutorialv2/migrations/0019_auto_20170208_1347.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0018_publishedcontent_is_obsolete"), ] diff --git a/zds/tutorialv2/migrations/0020_auto_20170401_1521.py b/zds/tutorialv2/migrations/0020_auto_20170401_1521.py index 24d0863b5b..1acb8df81c 100644 --- a/zds/tutorialv2/migrations/0020_auto_20170401_1521.py +++ b/zds/tutorialv2/migrations/0020_auto_20170401_1521.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0019_auto_20170208_1347"), ] diff --git a/zds/tutorialv2/migrations/0021_picklistoperation.py b/zds/tutorialv2/migrations/0021_picklistoperation.py index 6b80066479..d6e81d6c6f 100644 --- a/zds/tutorialv2/migrations/0021_picklistoperation.py +++ b/zds/tutorialv2/migrations/0021_picklistoperation.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("tutorialv2", "0020_auto_20170401_1521"), diff --git a/zds/tutorialv2/migrations/0022_python_3.py b/zds/tutorialv2/migrations/0022_python_3.py index 3bf28b18e5..e9dad33d32 100644 --- a/zds/tutorialv2/migrations/0022_python_3.py +++ b/zds/tutorialv2/migrations/0022_python_3.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0021_picklistoperation"), ] diff --git a/zds/tutorialv2/migrations/0023_auto_20190114_1301.py b/zds/tutorialv2/migrations/0023_auto_20190114_1301.py index 573380698e..144871cb21 100644 --- a/zds/tutorialv2/migrations/0023_auto_20190114_1301.py +++ b/zds/tutorialv2/migrations/0023_auto_20190114_1301.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0022_python_3"), ] diff --git a/zds/tutorialv2/migrations/0023_publishablecontent_validation_private_message.py b/zds/tutorialv2/migrations/0023_publishablecontent_validation_private_message.py index ebb4e0813c..3a7255e36f 100644 --- a/zds/tutorialv2/migrations/0023_publishablecontent_validation_private_message.py +++ b/zds/tutorialv2/migrations/0023_publishablecontent_validation_private_message.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("mp", "0004_python_3"), ("tutorialv2", "0027_auto_20190912_1936"), diff --git a/zds/tutorialv2/migrations/0024_publicationevent.py b/zds/tutorialv2/migrations/0024_publicationevent.py index b3f95e6bdf..2395c27891 100644 --- a/zds/tutorialv2/migrations/0024_publicationevent.py +++ b/zds/tutorialv2/migrations/0024_publicationevent.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0023_auto_20190114_1301"), ] diff --git a/zds/tutorialv2/migrations/0025_auto_20190415_1302.py b/zds/tutorialv2/migrations/0025_auto_20190415_1302.py index 83b06f084f..ec021aec5b 100644 --- a/zds/tutorialv2/migrations/0025_auto_20190415_1302.py +++ b/zds/tutorialv2/migrations/0025_auto_20190415_1302.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0024_publicationevent"), ] diff --git a/zds/tutorialv2/migrations/0026_publicationevent_date.py b/zds/tutorialv2/migrations/0026_publicationevent_date.py index c23072fa8a..605a4e8389 100644 --- a/zds/tutorialv2/migrations/0026_publicationevent_date.py +++ b/zds/tutorialv2/migrations/0026_publicationevent_date.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0025_auto_20190415_1302"), ] diff --git a/zds/tutorialv2/migrations/0027_auto_20190912_1936.py b/zds/tutorialv2/migrations/0027_auto_20190912_1936.py index 827081a846..efcf7c4338 100644 --- a/zds/tutorialv2/migrations/0027_auto_20190912_1936.py +++ b/zds/tutorialv2/migrations/0027_auto_20190912_1936.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0026_publicationevent_date"), ] diff --git a/zds/tutorialv2/migrations/0028_auto_20191024_1918.py b/zds/tutorialv2/migrations/0028_auto_20191024_1918.py index bc5a760de9..1781094dbb 100644 --- a/zds/tutorialv2/migrations/0028_auto_20191024_1918.py +++ b/zds/tutorialv2/migrations/0028_auto_20191024_1918.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("tutorialv2", "0023_publishablecontent_validation_private_message"), diff --git a/zds/tutorialv2/migrations/0029_auto_20191123_1955.py b/zds/tutorialv2/migrations/0029_auto_20191123_1955.py index 6fbe7f28dc..52a4087b07 100644 --- a/zds/tutorialv2/migrations/0029_auto_20191123_1955.py +++ b/zds/tutorialv2/migrations/0029_auto_20191123_1955.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0028_auto_20191024_1918"), ] diff --git a/zds/tutorialv2/migrations/0030_contentsuggestion.py b/zds/tutorialv2/migrations/0030_contentsuggestion.py index f02b5fd1eb..edfd79e108 100644 --- a/zds/tutorialv2/migrations/0030_contentsuggestion.py +++ b/zds/tutorialv2/migrations/0030_contentsuggestion.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0029_auto_20191123_1955"), ] diff --git a/zds/tutorialv2/migrations/0031_source_is_url.py b/zds/tutorialv2/migrations/0031_source_is_url.py index bdb9f90f59..e7cedfe404 100644 --- a/zds/tutorialv2/migrations/0031_source_is_url.py +++ b/zds/tutorialv2/migrations/0031_source_is_url.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0030_contentsuggestion"), ] diff --git a/zds/tutorialv2/migrations/0032_event.py b/zds/tutorialv2/migrations/0032_event.py index 3bb430e9a3..4a6d30b50b 100644 --- a/zds/tutorialv2/migrations/0032_event.py +++ b/zds/tutorialv2/migrations/0032_event.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("tutorialv2", "0031_source_is_url"), diff --git a/zds/tutorialv2/migrations/0033_move_helpwriting.py b/zds/tutorialv2/migrations/0033_move_helpwriting.py index a0c94791e7..a8f1318f76 100644 --- a/zds/tutorialv2/migrations/0033_move_helpwriting.py +++ b/zds/tutorialv2/migrations/0033_move_helpwriting.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0032_event"), ("utils", "0025_move_helpwriting"), diff --git a/zds/tutorialv2/migrations/0034_goals.py b/zds/tutorialv2/migrations/0034_goals.py index be69f65a72..a75e6bab54 100644 --- a/zds/tutorialv2/migrations/0034_goals.py +++ b/zds/tutorialv2/migrations/0034_goals.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0033_move_helpwriting"), ] diff --git a/zds/tutorialv2/migrations/0035_alter_publishablecontent_goals.py b/zds/tutorialv2/migrations/0035_alter_publishablecontent_goals.py index d967f1598d..b464136435 100644 --- a/zds/tutorialv2/migrations/0035_alter_publishablecontent_goals.py +++ b/zds/tutorialv2/migrations/0035_alter_publishablecontent_goals.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0034_goals"), ] diff --git a/zds/tutorialv2/migrations/0036_alter_contentsuggestion_options.py b/zds/tutorialv2/migrations/0036_alter_contentsuggestion_options.py index 21cff453b9..7e22e24ca9 100644 --- a/zds/tutorialv2/migrations/0036_alter_contentsuggestion_options.py +++ b/zds/tutorialv2/migrations/0036_alter_contentsuggestion_options.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0035_alter_publishablecontent_goals"), ] diff --git a/zds/tutorialv2/migrations/0037_labels.py b/zds/tutorialv2/migrations/0037_labels.py index 9944cfd9f7..4547d21869 100644 --- a/zds/tutorialv2/migrations/0037_labels.py +++ b/zds/tutorialv2/migrations/0037_labels.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0036_alter_contentsuggestion_options"), ] diff --git a/zds/tutorialv2/mixins.py b/zds/tutorialv2/mixins.py index ab96448aae..ddb76876cb 100644 --- a/zds/tutorialv2/mixins.py +++ b/zds/tutorialv2/mixins.py @@ -403,14 +403,12 @@ def get_public_object(self): return obj def get_object(self): - obj = self.public_content_object.content if obj is None: raise Http404("Le contenu de la publication n'est pas trouvé.") return obj def get_versioned_object(self): - return self.public_content_object.load_public_version_or_404() @@ -433,7 +431,6 @@ class SingleOnlineContentDetailViewMixin(SingleOnlineContentViewMixin, DetailVie """ def get(self, request, *args, **kwargs): - try: self.public_content_object = self.get_public_object() except MustRedirect as redirection_url: @@ -450,7 +447,6 @@ def get(self, request, *args, **kwargs): return self.render_to_response(context) def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) context["content"] = self.versioned_object diff --git a/zds/tutorialv2/models/database.py b/zds/tutorialv2/models/database.py index 52795bc066..6ca0ad4161 100644 --- a/zds/tutorialv2/models/database.py +++ b/zds/tutorialv2/models/database.py @@ -1016,7 +1016,6 @@ def get_es_indexable(cls, force_reindexing=False): # chapters are only indexed for middle and big tuto if versioned.has_sub_containers(): - # delete possible previous chapters if content.es_already_indexed: index_manager.delete_by_query( diff --git a/zds/tutorialv2/publish_container.py b/zds/tutorialv2/publish_container.py index 28e2195bc0..9590b705a9 100644 --- a/zds/tutorialv2/publish_container.py +++ b/zds/tutorialv2/publish_container.py @@ -204,7 +204,6 @@ def publish_container( container.children = [] container.children_dict = {} for child in filter(lambda c: c.ready_to_publish, children): - altered_version = copy.copy(child) container.children.append(altered_version) container.children_dict[altered_version.slug] = altered_version diff --git a/zds/tutorialv2/tests/__init__.py b/zds/tutorialv2/tests/__init__.py index 3d2be459ad..157afab775 100644 --- a/zds/tutorialv2/tests/__init__.py +++ b/zds/tutorialv2/tests/__init__.py @@ -28,7 +28,6 @@ def __init__(self, **kwargs): class TutorialTestMixin: - overridden_zds_app = overridden_zds_app def clean_media_dir(self): diff --git a/zds/tutorialv2/tests/tests_move.py b/zds/tutorialv2/tests/tests_move.py index 753a1f3fb5..ad565b20ec 100644 --- a/zds/tutorialv2/tests/tests_move.py +++ b/zds/tutorialv2/tests/tests_move.py @@ -22,7 +22,6 @@ @override_for_contents() class ContentMoveTests(TutorialTestMixin, TestCase): def setUp(self): - self.staff = StaffProfileFactory().user settings.EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" diff --git a/zds/tutorialv2/tests/tests_opinion_views.py b/zds/tutorialv2/tests/tests_opinion_views.py index 085a82e6f4..ca8227c72c 100644 --- a/zds/tutorialv2/tests/tests_opinion_views.py +++ b/zds/tutorialv2/tests/tests_opinion_views.py @@ -30,7 +30,6 @@ @override_for_contents() class PublishedContentTests(TutorialTestMixin, TestCase): def setUp(self): - self.overridden_zds_app["member"]["bot_account"] = ProfileFactory().user.username self.bot_group = Group() self.bot_group.name = settings.ZDS_APP["member"]["bot_group"] diff --git a/zds/tutorialv2/tests/tests_views/tests_addauthor.py b/zds/tutorialv2/tests/tests_views/tests_addauthor.py index 3e35acd824..8c9c425992 100644 --- a/zds/tutorialv2/tests/tests_views/tests_addauthor.py +++ b/zds/tutorialv2/tests/tests_views/tests_addauthor.py @@ -34,7 +34,6 @@ def setUp(self): @patch("zds.tutorialv2.signals.authors_management") def test_nominal(self, authors_management): - result = self.client.post( reverse("content:add-author", args=[self.tuto.pk]), {"username": self.user_guest.username}, follow=False ) @@ -49,7 +48,6 @@ def test_nominal(self, authors_management): @patch("zds.tutorialv2.signals.authors_management") def test_not_existing_user(self, authors_management): - result = self.client.post( reverse("content:add-author", args=[self.tuto.pk]), {"username": "unknown"}, follow=False ) @@ -60,7 +58,6 @@ def test_not_existing_user(self, authors_management): @patch("zds.tutorialv2.signals.authors_management") def test_bot(self, authors_management): - result = self.client.post( reverse("content:add-author", args=[self.tuto.pk]), {"username": self.external.username}, follow=False ) diff --git a/zds/tutorialv2/tests/tests_views/tests_content.py b/zds/tutorialv2/tests/tests_views/tests_content.py index ec7057128b..628cfaa130 100644 --- a/zds/tutorialv2/tests/tests_views/tests_content.py +++ b/zds/tutorialv2/tests/tests_views/tests_content.py @@ -55,7 +55,6 @@ @override_for_contents() class ContentTests(TutorialTestMixin, TestCase): def setUp(self): - self.staff = StaffProfileFactory().user settings.EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" @@ -2241,7 +2240,6 @@ def test_delete_while_validating(self): @patch("zds.tutorialv2.signals.jsfiddle_management") def test_js_fiddle_activation(self, jsfiddle_management): - self.client.force_login(self.staff) result = self.client.post( reverse("content:activate-jsfiddle"), {"pk": self.tuto.pk, "js_support": "on"}, follow=True @@ -2267,7 +2265,6 @@ def test_js_fiddle_activation(self, jsfiddle_management): self.assertEqual(jsfiddle_management.send.call_count, 2) def test_validate_unexisting(self): - self.client.force_login(self.user_author) result = self.client.post( reverse("validation:ask", kwargs={"pk": self.tuto.pk, "slug": self.tuto.slug}), @@ -3016,7 +3013,6 @@ def test_publication_make_extra_contents(self): self.client.force_login(self.user_author) for extra in avail_extra: - result = self.client.get(published.get_absolute_url_to_extra_content(extra)) self.assertEqual(result.status_code, 200) # test for visitor: diff --git a/zds/tutorialv2/tests/tests_views/tests_published.py b/zds/tutorialv2/tests/tests_views/tests_published.py index f57c019d9e..080a10ca79 100644 --- a/zds/tutorialv2/tests/tests_views/tests_published.py +++ b/zds/tutorialv2/tests/tests_views/tests_published.py @@ -488,7 +488,6 @@ def test_public_access(self): self.assertEqual(result.status_code, 404) def test_add_note(self): - message_to_post = "la ZEP-12" self.client.force_login(self.user_guest) @@ -650,7 +649,6 @@ def test_hide_reaction(self): self.assertTrue(reaction.is_visible) def test_alert_reaction(self): - self.client.force_login(self.user_guest) self.client.post( @@ -715,7 +713,6 @@ def test_alert_reaction(self): ) def test_warn_typo_without_accessible_author(self): - self.client.force_login(self.user_guest) result = self.client.post( reverse("content:warn-typo") + f"?pk={self.tuto.pk}", diff --git a/zds/tutorialv2/tests/tests_views/tests_stats.py b/zds/tutorialv2/tests/tests_views/tests_stats.py index d05c1b38ed..b12c613ffc 100644 --- a/zds/tutorialv2/tests/tests_views/tests_stats.py +++ b/zds/tutorialv2/tests/tests_views/tests_stats.py @@ -288,7 +288,6 @@ def test_query_date_parameter_duration(self, mock_post): @mock.patch("requests.post") def test_query_string_parameter_duration(self, mock_post): - # By default we only have the last 7 days default_duration = 7 self.client.force_login(self.user_author) diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index 5914138369..3c4982094b 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -461,7 +461,6 @@ def fill_containers_from_json(json_sub, parent): from zds.tutorialv2.models.versioned import Container, Extract if "children" in json_sub: - for child in json_sub["children"]: if not all_is_string_appart_from_given_keys(child, ("children", "ready_to_publish")): raise BadManifestError( diff --git a/zds/tutorialv2/views/archives.py b/zds/tutorialv2/views/archives.py index a4f76e3acd..d57d6c9901 100644 --- a/zds/tutorialv2/views/archives.py +++ b/zds/tutorialv2/views/archives.py @@ -183,7 +183,6 @@ def update_from_new_version_in_zip(copy_to, copy_from, zip_file): for child in copy_from.children: if isinstance(child, Container): - introduction = "" conclusion = "" @@ -237,7 +236,6 @@ def use_images_from_archive(request, zip_file, versioned_content, gallery): os.makedirs(temp) for image_path in zip_file.namelist(): - image_basename = os.path.basename(image_path) if not image_basename.strip(): # don't deal with directory @@ -347,7 +345,6 @@ def form_valid(self, form): messages.error(self.request, e.message) return super().form_invalid(form) else: - # Warn the user if the license has been changed manifest = json_handler.loads(str(zfile.read("manifest.json"), "utf-8")) if new_version.licence and "licence" in manifest and manifest["licence"] != new_version.licence.code: @@ -443,7 +440,6 @@ class CreateContentFromArchive(LoggedWithReadWriteHability, FormView): object = None def form_valid(self, form): - if self.request.FILES["archive"]: try: zfile = zipfile.ZipFile(self.request.FILES["archive"], "r") @@ -460,7 +456,6 @@ def form_valid(self, form): messages.error(self.request, _(e.message + " n'est pas correctement renseigné.")) return super().form_invalid(form) else: - # Warn the user if the license has been changed manifest = json_handler.loads(str(zfile.read("manifest.json"), "utf-8")) if new_content.licence and "licence" in manifest and manifest["licence"] != new_content.licence.code: diff --git a/zds/tutorialv2/views/authors.py b/zds/tutorialv2/views/authors.py index 3aae6d58be..b768d753af 100644 --- a/zds/tutorialv2/views/authors.py +++ b/zds/tutorialv2/views/authors.py @@ -30,7 +30,6 @@ def get(self, request, *args, **kwargs): return redirect(url, self.request.user) def form_valid(self, form): - _type = _("de l'article") if self.object.is_tutorial: @@ -83,7 +82,6 @@ def form_invalid(self, form): class RemoveAuthorFromContent(LoggedWithReadWriteHability, SingleContentFormViewMixin): - form_class = RemoveAuthorForm only_draft_version = True must_be_author = True @@ -112,7 +110,6 @@ def remove_author(content, user): return False def form_valid(self, form): - current_user = False users = form.cleaned_data["users"] diff --git a/zds/tutorialv2/views/comments.py b/zds/tutorialv2/views/comments.py index 56b7f83eb8..4c2bdd2b20 100644 --- a/zds/tutorialv2/views/comments.py +++ b/zds/tutorialv2/views/comments.py @@ -24,7 +24,6 @@ class SendNoteFormView(LoggedWithReadWriteHability, SingleOnlineContentFormViewMixin): - denied_if_lock = True form_class = NoteForm check_as = True @@ -82,7 +81,6 @@ def get_context_data(self, **kwargs): return context def get(self, request, *args, **kwargs): - # handle quoting case if "cite" in self.request.GET: try: @@ -112,7 +110,6 @@ def get(self, request, *args, **kwargs): ) def post(self, request, *args, **kwargs): - if "preview" in request.POST and request.is_ajax(): content = render(request, "misc/preview.part.html", {"text": request.POST["text"]}) return StreamingHttpResponse(content) @@ -120,7 +117,6 @@ def post(self, request, *args, **kwargs): return super().post(request, *args, **kwargs) def form_valid(self, form): - if self.check_as and self.object.antispam(self.request.user): raise PermissionDenied diff --git a/zds/tutorialv2/views/containers_extracts.py b/zds/tutorialv2/views/containers_extracts.py index ef56962a2d..c13192aad3 100644 --- a/zds/tutorialv2/views/containers_extracts.py +++ b/zds/tutorialv2/views/containers_extracts.py @@ -314,7 +314,6 @@ def delete(self, request, *args, **kwargs): class MoveChild(LoginRequiredMixin, SingleContentPostMixin, FormView): - model = PublishableContent form_class = MoveElementForm versioned = False diff --git a/zds/tutorialv2/views/contents.py b/zds/tutorialv2/views/contents.py index 0b9c589f35..006ef0d9bd 100644 --- a/zds/tutorialv2/views/contents.py +++ b/zds/tutorialv2/views/contents.py @@ -90,7 +90,6 @@ def get_context_data(self, **kwargs): return context def form_valid(self, form): - # create the object: self.content = PublishableContent() self.content.title = form.cleaned_data["title"] diff --git a/zds/tutorialv2/views/contributors.py b/zds/tutorialv2/views/contributors.py index b57579f708..f9a082ed98 100644 --- a/zds/tutorialv2/views/contributors.py +++ b/zds/tutorialv2/views/contributors.py @@ -40,7 +40,6 @@ def get(self, request, *args, **kwargs): return redirect(url, self.request.user) def form_valid(self, form): - _type = _("à l'article") if self.object.is_tutorial: @@ -107,7 +106,6 @@ def form_invalid(self, form): class RemoveContributorFromContent(LoggedWithReadWriteHability, SingleContentFormViewMixin): - form_class = RemoveContributionForm only_draft_version = True must_be_author = True diff --git a/zds/tutorialv2/views/download_online.py b/zds/tutorialv2/views/download_online.py index 130753e3f5..9e2215f802 100644 --- a/zds/tutorialv2/views/download_online.py +++ b/zds/tutorialv2/views/download_online.py @@ -24,7 +24,6 @@ def get_redirect_url(self, public_version): return public_version.content.public_version.get_absolute_url_to_extra_content(self.requested_file) def get(self, context, **response_kwargs): - # fill the variables try: self.public_content_object = self.get_public_object() @@ -69,15 +68,12 @@ def get_contents(self): class DownloadOnlineArticle(DownloadOnlineContent): - current_content_type = "ARTICLE" class DownloadOnlineTutorial(DownloadOnlineContent): - current_content_type = "TUTORIAL" class DownloadOnlineOpinion(DownloadOnlineContent): - current_content_type = "OPINION" diff --git a/zds/tutorialv2/views/editorialization.py b/zds/tutorialv2/views/editorialization.py index 4498c81e5b..faca1dcac9 100644 --- a/zds/tutorialv2/views/editorialization.py +++ b/zds/tutorialv2/views/editorialization.py @@ -15,7 +15,6 @@ class RemoveSuggestion(PermissionRequiredMixin, SingleContentFormViewMixin): - form_class = RemoveSuggestionForm modal_form = True only_draft_version = True diff --git a/zds/tutorialv2/views/lists.py b/zds/tutorialv2/views/lists.py index 8e7d2e8401..02ebd5da4e 100644 --- a/zds/tutorialv2/views/lists.py +++ b/zds/tutorialv2/views/lists.py @@ -299,7 +299,6 @@ def get_context_data(self, **kwargs): class TagsListView(ListView): - model = Tag template_name = "tutorialv2/view/tags.html" context_object_name = "tags" @@ -427,7 +426,6 @@ def get_context_data(self, **kwargs): class ListContentReactions(ZdSPagingListView): - context_object_name = "content_reactions" template_name = "tutorialv2/comment/list.html" paginate_by = settings.ZDS_APP["forum"]["posts_per_page"] diff --git a/zds/tutorialv2/views/misc.py b/zds/tutorialv2/views/misc.py index b54e7c9bb9..7ea06666b9 100644 --- a/zds/tutorialv2/views/misc.py +++ b/zds/tutorialv2/views/misc.py @@ -74,7 +74,6 @@ def post(self, request, *args, **kwargs): class WarnTypo(SingleContentFormViewMixin): - modal_form = True form_class = WarnTypoForm must_be_author = False @@ -84,7 +83,6 @@ class WarnTypo(SingleContentFormViewMixin): object = None def get_form_kwargs(self): - kwargs = super().get_form_kwargs() versioned = self.get_versioned_object() diff --git a/zds/tutorialv2/views/validations_contents.py b/zds/tutorialv2/views/validations_contents.py index 7f2238b87a..775bb03c0d 100644 --- a/zds/tutorialv2/views/validations_contents.py +++ b/zds/tutorialv2/views/validations_contents.py @@ -56,7 +56,6 @@ class ValidationListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): subcategory = None def get_queryset(self): - # TODO: many filter at the same time ? # TODO: paginate ? @@ -131,7 +130,6 @@ def get_form_kwargs(self): return kwargs def form_valid(self, form): - old_validation = Validation.objects.filter( content__pk=self.object.pk, status__in=["PENDING", "PENDING_V"] ).first() @@ -215,7 +213,6 @@ def get_form_kwargs(self): return kwargs def form_valid(self, form): - user = self.request.user validation = ( @@ -365,7 +362,6 @@ def post(self, request, *args, **kwargs): class ValidationHistoryView(LoginRequiredMixin, PermissionRequiredMixin, RequiresValidationViewMixin): - model = PublishableContent permission_required = "tutorialv2.change_validation" template_name = "tutorialv2/validation/history.html" @@ -397,7 +393,6 @@ def get_form_kwargs(self): return kwargs def form_valid(self, form): - user = self.request.user validation = Validation.objects.filter(pk=self.kwargs["pk"]).last() @@ -478,7 +473,6 @@ def get_form_kwargs(self): return kwargs def form_valid(self, form): - user = self.request.user validation = Validation.objects.filter(pk=self.kwargs["pk"]).last() @@ -543,7 +537,6 @@ def get_form_kwargs(self): return kwargs def form_valid(self, form): - versioned = self.versioned_object if form.cleaned_data["version"] != self.object.sha_public: @@ -613,7 +606,6 @@ def form_valid(self, form): class MarkObsolete(LoginRequiredMixin, PermissionRequiredMixin, FormView): - permission_required = "tutorialv2.change_validation" def get(self, request, *args, **kwargs): diff --git a/zds/utils/api/tests.py b/zds/utils/api/tests.py index 1669a96ae8..407d100f87 100644 --- a/zds/utils/api/tests.py +++ b/zds/utils/api/tests.py @@ -153,7 +153,6 @@ def create_multiple_tags(self, number_of_tags=REST_PAGE_SIZE): publish_content(content, content_draft) def tearDown(self): - if os.path.isdir(settings.ZDS_APP["content"]["repo_private_path"]): shutil.rmtree(settings.ZDS_APP["content"]["repo_private_path"]) if os.path.isdir(settings.ZDS_APP["content"]["repo_public_path"]): diff --git a/zds/utils/forms.py b/zds/utils/forms.py index e86324403a..30b9f32a5f 100644 --- a/zds/utils/forms.py +++ b/zds/utils/forms.py @@ -162,7 +162,6 @@ def check_text_length_limit(self, text, max_length, message_format): class PasswordRequiredForm(forms.Form): - password = forms.CharField( label=_("Mot de passe actuel"), widget=forms.PasswordInput, diff --git a/zds/utils/highlighter.py b/zds/utils/highlighter.py index 0097666ef6..7a45ac9966 100644 --- a/zds/utils/highlighter.py +++ b/zds/utils/highlighter.py @@ -6,7 +6,6 @@ class SearchHighlighter(Highlighter): def render_html(self, highlight_locations=None, start_offset=None, end_offset=None): - if start_offset is not None: start_offset = max([0, start_offset - MAX_WRAP_TEXT]) if end_offset is not None: diff --git a/zds/utils/management/commands/clean_alerts_and_notifications.py b/zds/utils/management/commands/clean_alerts_and_notifications.py index e9622d5c2a..ceb1a77a39 100644 --- a/zds/utils/management/commands/clean_alerts_and_notifications.py +++ b/zds/utils/management/commands/clean_alerts_and_notifications.py @@ -11,7 +11,6 @@ @transaction.atomic class Command(BaseCommand): - help = "Clean up useless notifications & alerts." def add_arguments(self, parser): diff --git a/zds/utils/management/commands/load_fixtures.py b/zds/utils/management/commands/load_fixtures.py index 6c20fc5129..dec45e3df1 100644 --- a/zds/utils/management/commands/load_fixtures.py +++ b/zds/utils/management/commands/load_fixtures.py @@ -617,7 +617,6 @@ def handle_content_with_chapter_and_parts( @transaction.atomic class Command(BaseCommand): - zds_resource_config = [ ZDSResource("member", "basic users", load_member, tuple()), ZDSResource("staff", "privileged users", load_staff, tuple()), diff --git a/zds/utils/management/tests.py b/zds/utils/management/tests.py index 7e479c8f5e..27e1805c33 100644 --- a/zds/utils/management/tests.py +++ b/zds/utils/management/tests.py @@ -21,7 +21,6 @@ @override_for_contents() class CommandsTestCase(TutorialTestMixin, TestCase): def test_load_fixtures(self): - args = [] opts = {"modules": FixtureCommand.zds_resource_config} call_command("load_fixtures", *args, **opts) diff --git a/zds/utils/migrations/0001_initial.py b/zds/utils/migrations/0001_initial.py index 0befd45eea..387d301b3b 100644 --- a/zds/utils/migrations/0001_initial.py +++ b/zds/utils/migrations/0001_initial.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] diff --git a/zds/utils/migrations/0002_comment_update_index_date.py b/zds/utils/migrations/0002_comment_update_index_date.py index de95581614..78111776d3 100644 --- a/zds/utils/migrations/0002_comment_update_index_date.py +++ b/zds/utils/migrations/0002_comment_update_index_date.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0001_initial"), ] diff --git a/zds/utils/migrations/0003_auto_20150414_2256.py b/zds/utils/migrations/0003_auto_20150414_2256.py index 50e7a90aa8..5333aeaac6 100644 --- a/zds/utils/migrations/0003_auto_20150414_2256.py +++ b/zds/utils/migrations/0003_auto_20150414_2256.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0002_comment_update_index_date"), ] diff --git a/zds/utils/migrations/0004_auto_20151229_1904.py b/zds/utils/migrations/0004_auto_20151229_1904.py index 936123c712..98b66bcb46 100644 --- a/zds/utils/migrations/0004_auto_20151229_1904.py +++ b/zds/utils/migrations/0004_auto_20151229_1904.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0003_auto_20150414_2256"), ] diff --git a/zds/utils/migrations/0005_commentvote.py b/zds/utils/migrations/0005_commentvote.py index 6a12dd408a..d4ce3df891 100644 --- a/zds/utils/migrations/0005_commentvote.py +++ b/zds/utils/migrations/0005_commentvote.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("utils", "0004_auto_20151229_1904"), diff --git a/zds/utils/migrations/0006_auto_20160509_1633.py b/zds/utils/migrations/0006_auto_20160509_1633.py index da1bce049e..5123b1431a 100644 --- a/zds/utils/migrations/0006_auto_20160509_1633.py +++ b/zds/utils/migrations/0006_auto_20160509_1633.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0005_commentvote"), ] diff --git a/zds/utils/migrations/0007_auto_20160511_2153.py b/zds/utils/migrations/0007_auto_20160511_2153.py index 664034b287..d899162edb 100644 --- a/zds/utils/migrations/0007_auto_20160511_2153.py +++ b/zds/utils/migrations/0007_auto_20160511_2153.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0006_auto_20160509_1633"), ] diff --git a/zds/utils/migrations/0008_auto_20161112_1757.py b/zds/utils/migrations/0008_auto_20161112_1757.py index 961a4a1eda..6629de07fb 100644 --- a/zds/utils/migrations/0008_auto_20161112_1757.py +++ b/zds/utils/migrations/0008_auto_20161112_1757.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("mp", "0002_auto_20150416_1750"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), diff --git a/zds/utils/migrations/0009_auto_20161113_2328.py b/zds/utils/migrations/0009_auto_20161113_2328.py index d054833ac1..d338fd25a2 100644 --- a/zds/utils/migrations/0009_auto_20161113_2328.py +++ b/zds/utils/migrations/0009_auto_20161113_2328.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0008_auto_20161112_1757"), ] diff --git a/zds/utils/migrations/0010_auto_20170203_2100.py b/zds/utils/migrations/0010_auto_20170203_2100.py index 050b6f774c..113f661a27 100644 --- a/zds/utils/migrations/0010_auto_20170203_2100.py +++ b/zds/utils/migrations/0010_auto_20170203_2100.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0009_auto_20161113_2328"), ] diff --git a/zds/utils/migrations/0011_auto_20170401_1521.py b/zds/utils/migrations/0011_auto_20170401_1521.py index b1726b03e9..01107187c3 100644 --- a/zds/utils/migrations/0011_auto_20170401_1521.py +++ b/zds/utils/migrations/0011_auto_20170401_1521.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [ ("tutorialv2", "0020_auto_20170401_1521"), ("utils", "0010_auto_20170203_2100"), diff --git a/zds/utils/migrations/0012_commentedit.py b/zds/utils/migrations/0012_commentedit.py index 2431a96cfa..62892f9945 100644 --- a/zds/utils/migrations/0012_commentedit.py +++ b/zds/utils/migrations/0012_commentedit.py @@ -3,7 +3,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("utils", "0011_auto_20170401_1521"), diff --git a/zds/utils/migrations/0013_tags.py b/zds/utils/migrations/0013_tags.py index a8e649d431..5abd3107fd 100644 --- a/zds/utils/migrations/0013_tags.py +++ b/zds/utils/migrations/0013_tags.py @@ -29,7 +29,6 @@ def force_unicity(*args, **kwargs): class Migration(migrations.Migration): - dependencies = [ ("utils", "0012_commentedit"), ] diff --git a/zds/utils/migrations/0014_auto_20170905_2220.py b/zds/utils/migrations/0014_auto_20170905_2220.py index 7fd7f359d0..cd2a2d36cd 100644 --- a/zds/utils/migrations/0014_auto_20170905_2220.py +++ b/zds/utils/migrations/0014_auto_20170905_2220.py @@ -7,7 +7,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("utils", "0013_tags"), diff --git a/zds/utils/migrations/0015_hat_group.py b/zds/utils/migrations/0015_hat_group.py index c7e7f9d321..6dadad5a40 100644 --- a/zds/utils/migrations/0015_hat_group.py +++ b/zds/utils/migrations/0015_hat_group.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("auth", "0008_alter_user_username_max_length"), ("utils", "0014_auto_20170905_2220"), diff --git a/zds/utils/migrations/0016_python_3.py b/zds/utils/migrations/0016_python_3.py index b9274f3d32..95dffd5163 100644 --- a/zds/utils/migrations/0016_python_3.py +++ b/zds/utils/migrations/0016_python_3.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0015_hat_group"), ] diff --git a/zds/utils/migrations/0017_hat_is_staff.py b/zds/utils/migrations/0017_hat_is_staff.py index 73f149928b..f9bcdeccf1 100644 --- a/zds/utils/migrations/0017_hat_is_staff.py +++ b/zds/utils/migrations/0017_hat_is_staff.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0016_python_3"), ] diff --git a/zds/utils/migrations/0018_auto_20171006_2126.py b/zds/utils/migrations/0018_auto_20171006_2126.py index cc24de5bd7..798b2c1e0f 100644 --- a/zds/utils/migrations/0018_auto_20171006_2126.py +++ b/zds/utils/migrations/0018_auto_20171006_2126.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("utils", "0017_hat_is_staff"), diff --git a/zds/utils/migrations/0019_auto_20180102_1659.py b/zds/utils/migrations/0019_auto_20180102_1659.py index 91fe1c8f16..3ff2c9c24f 100644 --- a/zds/utils/migrations/0019_auto_20180102_1659.py +++ b/zds/utils/migrations/0019_auto_20180102_1659.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0018_auto_20171006_2126"), ] diff --git a/zds/utils/migrations/0020_auto_20180501_1059.py b/zds/utils/migrations/0020_auto_20180501_1059.py index 12122b7784..14234341e0 100644 --- a/zds/utils/migrations/0020_auto_20180501_1059.py +++ b/zds/utils/migrations/0020_auto_20180501_1059.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0019_auto_20180102_1659"), ] diff --git a/zds/utils/migrations/0021_auto_20180826_1616.py b/zds/utils/migrations/0021_auto_20180826_1616.py index a55d613f71..49ad73f61c 100644 --- a/zds/utils/migrations/0021_auto_20180826_1616.py +++ b/zds/utils/migrations/0021_auto_20180826_1616.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("member", "0017_profile_email_for_new_mp"), ("utils", "0022_auto_20190115_1249"), diff --git a/zds/utils/migrations/0021_auto_20190114_1301.py b/zds/utils/migrations/0021_auto_20190114_1301.py index 3424039e4a..a3b76b6c82 100644 --- a/zds/utils/migrations/0021_auto_20190114_1301.py +++ b/zds/utils/migrations/0021_auto_20190114_1301.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0020_auto_20180501_1059"), ] diff --git a/zds/utils/migrations/0022_auto_20190115_1249.py b/zds/utils/migrations/0022_auto_20190115_1249.py index 7a3e4bb517..4ff870f175 100644 --- a/zds/utils/migrations/0022_auto_20190115_1249.py +++ b/zds/utils/migrations/0022_auto_20190115_1249.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0021_auto_20190114_1301"), ] diff --git a/zds/utils/migrations/0022_set_default_latest_by_for_alerts.py b/zds/utils/migrations/0022_set_default_latest_by_for_alerts.py index efea817052..edf13aa73b 100644 --- a/zds/utils/migrations/0022_set_default_latest_by_for_alerts.py +++ b/zds/utils/migrations/0022_set_default_latest_by_for_alerts.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0021_auto_20180826_1616"), ] diff --git a/zds/utils/migrations/0023_move_potential_spam_to_comment_model.py b/zds/utils/migrations/0023_move_potential_spam_to_comment_model.py index d52878a8b2..df6bd410ce 100644 --- a/zds/utils/migrations/0023_move_potential_spam_to_comment_model.py +++ b/zds/utils/migrations/0023_move_potential_spam_to_comment_model.py @@ -37,7 +37,6 @@ def copy_potential_spam_to_forum_post(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ("utils", "0022_set_default_latest_by_for_alerts"), # We must first temporarily rename the old field to something else, because diff --git a/zds/utils/migrations/0024_alter_hatrequest_is_granted.py b/zds/utils/migrations/0024_alter_hatrequest_is_granted.py index 2f2b73fdc5..fb189acc0b 100644 --- a/zds/utils/migrations/0024_alter_hatrequest_is_granted.py +++ b/zds/utils/migrations/0024_alter_hatrequest_is_granted.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("utils", "0023_move_potential_spam_to_comment_model"), ] diff --git a/zds/utils/migrations/0025_move_helpwriting.py b/zds/utils/migrations/0025_move_helpwriting.py index f3e861ac38..7435a5aed9 100644 --- a/zds/utils/migrations/0025_move_helpwriting.py +++ b/zds/utils/migrations/0025_move_helpwriting.py @@ -2,7 +2,6 @@ class Migration(migrations.Migration): - dependencies = [("utils", "0024_alter_hatrequest_is_granted")] database_operations = [migrations.AlterModelTable("HelpWriting", "tutorialv2_helpwriting")] diff --git a/zds/utils/templatetags/elasticsearch.py b/zds/utils/templatetags/elasticsearch.py index 457ae0802d..cf8da0257d 100644 --- a/zds/utils/templatetags/elasticsearch.py +++ b/zds/utils/templatetags/elasticsearch.py @@ -64,7 +64,6 @@ def render(self, context): @register.tag def highlight(parser, token): - part = token.split_contents() if len(part) != 3: diff --git a/zds/utils/templatetags/htmldiff.py b/zds/utils/templatetags/htmldiff.py index 22417c19c6..2e5139b7a5 100644 --- a/zds/utils/templatetags/htmldiff.py +++ b/zds/utils/templatetags/htmldiff.py @@ -10,7 +10,6 @@ @register.simple_tag def htmldiff(string1, string2): - try: txt1 = string1.decode("utf-8").splitlines() # string1 is an empty SafeText from template diff --git a/zds/utils/tests/tests_append_query_params.py b/zds/utils/tests/tests_append_query_params.py index ba0daf36e1..bc41e8b0d5 100644 --- a/zds/utils/tests/tests_append_query_params.py +++ b/zds/utils/tests/tests_append_query_params.py @@ -15,7 +15,6 @@ def my_function(a, b, c): self.wrapped_function = easy_tag(self.simple_function) def test_valid_call(self): - # Call tag without parser and three elements ret = self.wrapped_function(None, Token(TokenType.TEXT, "elem1 elem2 elem3")) @@ -30,7 +29,6 @@ def test_valid_call(self): self.assertEqual(self.simple_function.__doc__, self.wrapped_function.__doc__) def test_invalid_call(self): - wf = self.wrapped_function # Check raising TemplateSyntaxError if call with too few arguments self.assertRaises(TemplateSyntaxError, wf, None, Token(TokenType.TEXT, "elem1 elem2")) @@ -47,7 +45,6 @@ def setUp(self): self.context = Context({"request": factory.get("/data/test"), "var1": 1, "var2": 2}) def test_valid_call(self): - # Test normal call agn = AppendGetNode("key1=var1,key2=var2") tr = agn.render(self.context) @@ -64,7 +61,6 @@ def test_valid_call(self): self.assertEqual(tr, "/data/test") def test_invalid_call(self): - # Test invalid format # Space separators args : @@ -77,7 +73,6 @@ def test_invalid_call(self): self.assertRaises(VariableDoesNotExist, agn.render, self.context) def test_valid_templatetag(self): - # Test normal call tr = Template("{% load append_query_params %}" "{% append_query_params key1=var1,key2=var2 %}").render( self.context diff --git a/zds/utils/tests/tests_captureas.py b/zds/utils/tests/tests_captureas.py index d2db8e636d..752bf8677a 100644 --- a/zds/utils/tests/tests_captureas.py +++ b/zds/utils/tests/tests_captureas.py @@ -7,7 +7,6 @@ def setUp(self): self.context = Context() def test_valid_templatetag(self): - # Test empty element self.assertFalse("var1" in self.context) tr = Template("{% load captureas %}" "{% captureas var1%}" "{% endcaptureas %}").render(self.context) diff --git a/zds/utils/tests/tests_date.py b/zds/utils/tests/tests_date.py index d47e3b5432..3611395727 100644 --- a/zds/utils/tests/tests_date.py +++ b/zds/utils/tests/tests_date.py @@ -8,7 +8,6 @@ class DateFormatterTest(TestCase): # todo: Add test with localization parameters def setUp(self): - now = datetime.now() date_previous_in_day = now - timedelta(hours=1) date_previous_abs = datetime(2013, 9, 12, hour=11, minute=10, second=42, microsecond=10) @@ -78,7 +77,6 @@ def test_tooltip_date(self): self.assertEqual("None", tr) def test_humane_time(self): - # Default behaviour tr = Template("{% load date %}" "{{ date_epoch | humane_time }}").render(self.context) diff --git a/zds/utils/tests/tests_interventions.py b/zds/utils/tests/tests_interventions.py index 1238b06867..23f43058db 100644 --- a/zds/utils/tests/tests_interventions.py +++ b/zds/utils/tests/tests_interventions.py @@ -59,7 +59,6 @@ def setUp(self): self.context = Context(cont) def test_interventions_privatetopics(self): - self.client.force_login(self.author.user) response = self.client.post(reverse("homepage")) self.assertEqual(200, response.status_code) @@ -73,7 +72,6 @@ def test_interventions_privatetopics(self): self.assertContains(response, '1', html=True) def test_interventions_privatetopics_author_leave(self): - # profile1 (author) leave topic move = self.topic.participants.first() self.topic.author = move diff --git a/zds/utils/tests/tests_messages.py b/zds/utils/tests/tests_messages.py index 6d62d69f70..fd845a166c 100644 --- a/zds/utils/tests/tests_messages.py +++ b/zds/utils/tests/tests_messages.py @@ -10,11 +10,9 @@ class FunctionTests(SimpleTestCase): - tags = [constants.DEBUG, constants.INFO, constants.SUCCESS, constants.WARNING, constants.ERROR] def test_messages(self): - for tag in self.tags: txt = f"some message with {repr(tag)}" diff --git a/zds/utils/tests/tests_models.py b/zds/utils/tests/tests_models.py index 458a913d52..d8dc224870 100644 --- a/zds/utils/tests/tests_models.py +++ b/zds/utils/tests/tests_models.py @@ -74,13 +74,11 @@ def test_validator_with_correct_tags(self): self.assertEqual(validator.errors, []) def test_validator_with_special_char_only(self): - validator = TagValidator() self.assertFalse(validator.validate_raw_string("^")) self.assertEqual(len(validator.errors), 1) def test_validator_with_utf8mb4(self): - raw_string = "🐙☢,bla" validator = TagValidator() self.assertFalse(validator.validate_raw_string(raw_string)) diff --git a/zds/utils/validators.py b/zds/utils/validators.py index db628ab771..5a6823552a 100644 --- a/zds/utils/validators.py +++ b/zds/utils/validators.py @@ -55,7 +55,6 @@ class InvalidSlugError(ValueError): """ def __init__(self, *args, **kwargs): - self.source = "" self.had_source = False