From db02e7f12ea10b5d67fa70d89de3c641e74dc351 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Sat, 3 Sep 2022 12:15:43 -0500 Subject: [PATCH] Formatting --- .pylintrc | 16 +++++++++++++ .vscode/settings.json | 4 +++- coderdojochi/urls.py | 52 ++++++++++++++++++++++--------------------- weallcode/urls.py | 12 +++++----- 4 files changed, 52 insertions(+), 32 deletions(-) create mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 00000000..4d1b29c5 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,16 @@ +[MASTER] +load-plugins=pylint_django +django-settings-module=coderdojochi.settings + +[FORMAT] +max-line-length=120 + +[MESSAGES CONTROL] +disable=missing-docstring,invalid-name + +[DESIGN] +max-parents=13 + +[TYPECHECK] +generated-members=REQUEST,acl_users,aq_parent,"[a-zA-Z]+_set{1,2}",save,delete + diff --git a/.vscode/settings.json b/.vscode/settings.json index 361a2126..507a5692 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,6 +23,7 @@ "css": ["css", "less", "scss"], "html": ["htm", "html", "django-html"] }, + "python.defaultInterpreterPath": "python", "python.formatting.provider": "black", "python.linting.ignorePatterns": [ ".vscode/*.py", @@ -50,7 +51,8 @@ } }, "[django-html]": { - "editor.defaultFormatter": "HookyQR.beautify", + // + "editor.defaultFormatter": "batisteo.vscode-django", "editor.quickSuggestions": { "other": true, "comments": true, diff --git a/coderdojochi/urls.py b/coderdojochi/urls.py index 924c4cb8..fe7195e1 100644 --- a/coderdojochi/urls.py +++ b/coderdojochi/urls.py @@ -7,8 +7,8 @@ from django.views import defaults from django.views.generic import RedirectView -from . import old_views -from .views import ( # SessionDetailView, +from coderdojochi import old_views +from coderdojochi.views import ( # SessionDetailView, MeetingCalendarView, MeetingDetailView, MeetingsView, @@ -20,7 +20,7 @@ meeting_announce, meeting_sign_up, ) -from .views.public import MentorDetailView, MentorListView +from coderdojochi.views.public import MentorDetailView, MentorListView admin.autodiscover() @@ -52,15 +52,15 @@ # /meetings/ path("", MeetingsView.as_view(), name="meetings"), # Individual Meeting - # /meeting/ID/ + # /meeting// path("/", MeetingDetailView.as_view(), name="meeting-detail"), - # /meeting/ID/announce/ + # /meeting//announce/ path("/announce/", meeting_announce, name="meeting-announce"), # Meeting sign up - # /meeting/ID/sign-up/ + # /meeting//sign-up/ path("/register/", meeting_sign_up, name="meeting-register"), # Meeting Calendar - # /meeting/ID/calendar/ + # /meeting//calendar/ path("/calendar/", MeetingCalendarView.as_view(), name="meeting-calendar"), ] ), @@ -94,16 +94,18 @@ "classes/", include( [ - # /admin/classes/ID/stats/ + # /admin/classes//stats/ path("/stats/", old_views.session_stats, name="stats"), - # /admin/classes/ID/check-in/ + # /admin/classes//check-in/ path("/check-in/", old_views.session_check_in, name="student-check-in"), - # /admin/classes/ID/check-in-mentors/ + # /admin/classes//check-in-mentors/ path( "/check-in-mentors/", old_views.session_check_in_mentors, name="mentor-check-in" ), - # /admin/classes/ID/donations/ + # /admin/classes//donations/ path("/donations/", old_views.session_donations, name="donations"), + # /admin/classes//list/ + # path("/list", ) ] ), ), @@ -111,7 +113,7 @@ "meetings/", include( [ - # /admin/meeting/ID/check-in/ + # /admin/meeting//check-in/ path("/check-in/", old_views.meeting_check_in, name="meeting-check-in"), ] ), @@ -134,27 +136,27 @@ # /classes/ path("", RedirectView.as_view(pattern_name="weallcode-programs"), name="sessions"), # Individual Class - # /classes/ID/ + # /classes// path("/", SessionDetailView.as_view(), name="session-detail"), # Password - # /classes/ID/password/ + # /classes//password/ path("/password/", PasswordSessionView.as_view(), name="session-password"), # Announce - # /classes/ID/announce/mentors/ + # /classes//announce/mentors/ path("/announce/mentors/", old_views.session_announce_mentors, name="session-announce-mentors"), - # /classes/ID/announce/guardians/ + # /classes//announce/guardians/ path( "/announce/guardians/", old_views.session_announce_guardians, name="session-announce-guardians", ), # Calendar - # /classes/ID/calendar/ + # /classes//calendar/ path("/calendar/", SessionCalendarView.as_view(), name="session-calendar"), # Sign up - # /classes/ID/sign-up/ + # /classes//sign-up/ path("/sign-up/", SessionSignUpView.as_view(), name="session-sign-up"), - # /classes/ID/sign-up/STUDENT-ID/ + # /classes//sign-up/STUDENT-ID/ path("/sign-up//", SessionSignUpView.as_view(), name="session-sign-up"), ] ), @@ -170,13 +172,13 @@ include( [ # Mentors - # / + # /mentors/ path("", MentorListView.as_view(), name="mentors"), - # /ID/ + # /mentors// path("/", MentorDetailView.as_view(), name="mentor-detail"), - # /ID/reject-avatar/ + # /mentors//reject-avatar/ path("/reject-avatar/", old_views.mentor_reject_avatar, name="mentor-reject-avatar"), - # /ID/approve-avatar/ + # /mentors//approve-avatar/ path("/approve-avatar/", old_views.mentor_approve_avatar, name="mentor-approve-avatar"), ] ), @@ -186,7 +188,7 @@ # Students urlpatterns += [ # Student - # /student/ID/ + # /students// path("students//", old_views.student_detail, name="student-detail"), ] @@ -203,7 +205,7 @@ # Meetings urlpatterns += [] -# robots.txt +# /robots.txt urlpatterns += [ path( "robots.txt", diff --git a/weallcode/urls.py b/weallcode/urls.py index a2df45ab..b470e8c1 100644 --- a/weallcode/urls.py +++ b/weallcode/urls.py @@ -73,11 +73,11 @@ handler404 = "weallcode.views.page_not_found_view" -# Sentry Testing -def trigger_error(request): - division_by_zero = 1 / 0 +# # Sentry Testing +# def trigger_error(request): +# division_by_zero = 1 / 0 -urlpatterns += [ - path("test--sentry/", trigger_error), -] +# urlpatterns += [ +# path("test--sentry/", trigger_error), # type: ignore +# ]