README.md changes and newsletter removal

judge/views/register.py

@@ -17,7 +17,6 @@ from sortedm2m.forms import SortedMultipleChoiceField
 
 from judge.models import Language, Organization, Profile, TIMEZONE
 from judge.utils.recaptcha import ReCaptchaField, ReCaptchaWidget
-from judge.utils.subscription import Subscription, newsletter_id
 from judge.widgets import Select2MultipleWidget, Select2Widget
 
 valid_id = re.compile(r"^\w+$")
@@ -51,11 +50,6 @@ class CustomRegistrationForm(RegistrationForm):
         widget=Select2MultipleWidget(attrs={"style": "width:100%"}),
     )
 
-    if newsletter_id is not None:
-        newsletter = forms.BooleanField(
-            label=_("Subscribe to newsletter?"), initial=True, required=False
-        )
-
     if ReCaptchaField is not None:
         captcha = ReCaptchaField(widget=ReCaptchaWidget())
 
@@ -124,9 +118,6 @@ class RegistrationView(OldRegistrationView):
         profile.language = cleaned_data["language"]
         profile.organizations.add(*cleaned_data["organizations"])
         profile.save()
-
-        #if newsletter_id is not None and cleaned_data["newsletter"]:
-        #    Subscription(user=user, newsletter_id=newsletter_id, subscribed=True).save()
         return user
 
     def get_initial(self, *args, **kwargs):

judge/views/user.py

@@ -35,14 +35,13 @@ from django.views.generic import DetailView, ListView, TemplateView
 from django.template.loader import render_to_string
 from reversion import revisions
 
-from judge.forms import UserForm, ProfileForm, newsletter_id
+from judge.forms import UserForm, ProfileForm
 from judge.models import Profile, Rating, Submission, Friend
 from judge.performance_points import get_pp_breakdown
 from judge.ratings import rating_class, rating_progress
 from judge.tasks import import_users
 from judge.utils.problems import contest_completed_ids, user_completed_ids
 from judge.utils.ranker import ranker
-from judge.utils.subscription import Subscription
 from judge.utils.unicode import utf8text
 from judge.utils.views import (
     DiggPaginatorMixin,
@@ -416,26 +415,6 @@ def edit_profile(request):
                 revisions.set_user(request.user)
                 revisions.set_comment(_("Updated on site"))
 
-            if newsletter_id is not None:
-                try:
-                    subscription = Subscription.objects.get(
-                        user=request.user, newsletter_id=newsletter_id
-                    )
-                except Subscription.DoesNotExist:
-                    if form.cleaned_data["newsletter"]:
-                        Subscription(
-                            user=request.user,
-                            newsletter_id=newsletter_id,
-                            subscribed=True,
-                        ).save()
-                else:
-                    if subscription.subscribed != form.cleaned_data["newsletter"]:
-                        subscription.update(
-                            ("unsubscribe", "subscribe")[
-                                form.cleaned_data["newsletter"]
-                            ]
-                        )
-
             perm = Permission.objects.get(
                 codename="test_site",
                 content_type=ContentType.objects.get_for_model(Profile),
@@ -449,15 +428,6 @@ def edit_profile(request):
     else:
         form_user = UserForm(instance=request.user)
         form = ProfileForm(instance=profile, user=request.user)
-        if newsletter_id is not None:
-            try:
-                subscription = Subscription.objects.get(
-                    user=request.user, newsletter_id=newsletter_id
-                )
-            except Subscription.DoesNotExist:
-                form.fields["newsletter"].initial = False
-            else:
-                form.fields["newsletter"].initial = subscription.subscribed
         form.fields["test_site"].initial = request.user.has_perm("judge.test_site")
 
     tzmap = settings.TIMEZONE_MAP