Fix linter issues and generate translations

Author: patelneel55

tests/functional/test_templates.py

@@ -98,7 +98,6 @@ def test_render_templates():
                 try:
                     env.get_template(rel_file)
                 except Exception as e:
-                    print(rel_file)
                     exceptions.append(e)
 
     assert len(exceptions) == 0

tests/unit/manage/test_views.py

@@ -3607,10 +3607,22 @@ def test_change_role(self, db_request, monkeypatch):
         )
         db_request.route_path = pretend.call_recorder(lambda *a, **kw: "/the-redirect")
 
-        send_collaborator_role_changed_email = pretend.call_recorder(lambda *a, **kw: None)
-        monkeypatch.setattr(views, "send_collaborator_role_changed_email", send_collaborator_role_changed_email)
-        send_role_changed_as_collaborator_email = pretend.call_recorder(lambda *a, **kw: None)
-        monkeypatch.setattr(views, "send_role_changed_as_collaborator_email", send_role_changed_as_collaborator_email)
+        send_collaborator_role_changed_email = pretend.call_recorder(
+            lambda *a, **kw: None
+        )
+        monkeypatch.setattr(
+            views,
+            "send_collaborator_role_changed_email",
+            send_collaborator_role_changed_email,
+        )
+        send_role_changed_as_collaborator_email = pretend.call_recorder(
+            lambda *a, **kw: None
+        )
+        monkeypatch.setattr(
+            views,
+            "send_role_changed_as_collaborator_email",
+            send_role_changed_as_collaborator_email,
+        )
 
         result = views.change_project_role(project, db_request)
 
@@ -3730,9 +3742,17 @@ def test_delete_role(self, db_request, monkeypatch):
         db_request.route_path = pretend.call_recorder(lambda *a, **kw: "/the-redirect")
 
         send_collaborator_removed_email = pretend.call_recorder(lambda *a, **kw: None)
-        monkeypatch.setattr(views, "send_collaborator_removed_email", send_collaborator_removed_email)
-        send_removed_as_collaborator_email = pretend.call_recorder(lambda *a, **kw: None)
-        monkeypatch.setattr(views, "send_removed_as_collaborator_email", send_removed_as_collaborator_email)
+        monkeypatch.setattr(
+            views, "send_collaborator_removed_email", send_collaborator_removed_email
+        )
+        send_removed_as_collaborator_email = pretend.call_recorder(
+            lambda *a, **kw: None
+        )
+        monkeypatch.setattr(
+            views,
+            "send_removed_as_collaborator_email",
+            send_removed_as_collaborator_email,
+        )
 
         result = views.delete_project_role(project, db_request)
 
@@ -3742,20 +3762,11 @@ def test_delete_role(self, db_request, monkeypatch):
         assert db_request.db.query(Role).all() == []
         assert send_collaborator_removed_email.calls == [
             pretend.call(
-                db_request,
-                set(),
-                user=user,
-                submitter=user_2,
-                project_name="foobar",
+                db_request, set(), user=user, submitter=user_2, project_name="foobar",
             )
         ]
         assert send_removed_as_collaborator_email.calls == [
-            pretend.call(
-                db_request,
-                user,
-                submitter=user_2,
-                project_name="foobar",
-            )
+            pretend.call(db_request, user, submitter=user_2, project_name="foobar",)
         ]
         assert db_request.session.flash.calls == [
             pretend.call("Removed role", queue="success")

warehouse/locale/messages.pot

@@ -175,25 +175,25 @@ msgstr ""
 msgid "Email address ${email_address} verified. ${confirm_message}."
 msgstr ""
 
-#: warehouse/manage/views.py:190
+#: warehouse/manage/views.py:194
 msgid "Email ${email_address} added - check your email for a verification link"
 msgstr ""
 
-#: warehouse/manage/views.py:671 warehouse/manage/views.py:707
+#: warehouse/manage/views.py:675 warehouse/manage/views.py:711
 msgid ""
 "You must provision a two factor method before recovery codes can be "
 "generated"
 msgstr ""
 
-#: warehouse/manage/views.py:682
+#: warehouse/manage/views.py:686
 msgid "Recovery codes already generated"
 msgstr ""
 
-#: warehouse/manage/views.py:683
+#: warehouse/manage/views.py:687
 msgid "Generating new recovery codes will invalidate your existing codes."
 msgstr ""
 
-#: warehouse/manage/views.py:734
+#: warehouse/manage/views.py:738
 msgid "Invalid credentials. Try again"
 msgstr ""
 
@@ -1127,6 +1127,51 @@ msgid ""
 "project on %(site)s."
 msgstr ""
 
+#: warehouse/templates/email/collaborator-removed/body.html:27
+#, python-format
+msgid ""
+"\n"
+"     A collaborator was removed from a project you own on %(site)s:\n"
+"   \n"
+"     <ul class=\"collaborator-details\">\n"
+"       <li><strong>Username</strong>: %(username)s</li>\n"
+"       <li><strong>Collaborator for</strong>: %(project)s</li>\n"
+"       <li><strong>Removed by</strong>: %(submitter)s</li>\n"
+"     </ul>\n"
+"   </p>\n"
+"   "
+msgstr ""
+
+#: warehouse/templates/email/collaborator-removed/body.html:38
+#: warehouse/templates/email/collaborator-role-changed/body.html:39
+#, python-format
+msgid ""
+"If this was a mistake, you can email <a "
+"href=\"%(admin_mail)s\">[email protected]</a> to communicate with the PyPI "
+"administrators."
+msgstr ""
+
+#: warehouse/templates/email/collaborator-removed/body.html:43
+#: warehouse/templates/email/collaborator-role-changed/body.html:44
+msgid "You are receiving this because you are an owner of this project."
+msgstr ""
+
+#: warehouse/templates/email/collaborator-role-changed/body.html:27
+#, python-format
+msgid ""
+"\n"
+"     A collaborator's role was changed on a project you own on %(site)s:\n"
+"   \n"
+"     <ul class=\"collaborator-details\">\n"
+"       <li><strong>Username</strong>: %(username)s</li>\n"
+"       <li><strong>New role</strong>: %(role)s</li>\n"
+"       <li><strong>Collaborator for</strong>: %(project)s</li>\n"
+"       <li><strong>Changed by</strong>: %(submitter)s</li>\n"
+"     </ul>\n"
+"   </p>\n"
+"   "
+msgstr ""
+
 #: warehouse/templates/email/password-change/body.html:18
 #, python-format
 msgid ""
@@ -1267,6 +1312,44 @@ msgid ""
 "<code>%(new_email)s</code>"
 msgstr ""
 
+#: warehouse/templates/email/removed-as-collaborator/body.html:19
+#, python-format
+msgid ""
+"You have been removed as collaborator by %(submitter)s from %(project)s "
+"on %(site)s."
+msgstr ""
+
+#: warehouse/templates/email/removed-as-collaborator/body.html:24
+#, python-format
+msgid ""
+"You are receiving this because you were removed as a collaborator by "
+"%(submitter)s from %(project)s."
+msgstr ""
+
+#: warehouse/templates/email/role-changed-as-collaborator/body.html:20
+#, python-format
+msgid "Your role in the %(project)s project has been changed by %(submitter)s."
+msgstr ""
+
+#: warehouse/templates/email/role-changed-as-collaborator/body.html:23
+msgid ""
+"You are now a project owner. You can add other collaborators, upload "
+"releases and delete files, releases or the entire project."
+msgstr ""
+
+#: warehouse/templates/email/role-changed-as-collaborator/body.html:25
+msgid ""
+"You are now a project maintainer. You can upload releases but cannot add "
+"collaborators, delete files, releases or the project."
+msgstr ""
+
+#: warehouse/templates/email/role-changed-as-collaborator/body.html:32
+#, python-format
+msgid ""
+"You are receiving this because your role was changed by %(submitter)s on "
+"the %(project)s project."
+msgstr ""
+
 #: warehouse/templates/email/two-factor-added/body.html:18
 #, python-format
 msgid ""

warehouse/manage/views.py

@@ -1560,7 +1560,8 @@ def change_project_role(project, request, _form_class=ChangeRoleForm):
                     .all()
                 )
                 owner_users = {owner.user for owner in owner_roles}
-                # Don't send owner notification email to new user if they are now an owner 
+                # Don't send owner notification email to new user
+                # if they are now an owner
                 owner_users.discard(role.user)
                 send_collaborator_role_changed_email(
                     request,
@@ -1608,7 +1609,6 @@ def delete_project_role(project, request):
         if removing_self:
             request.session.flash("Cannot remove yourself as Owner", queue="error")
         else:
-            role_user = role.user
             request.db.delete(role)
             request.db.add(
                 JournalEntry(
@@ -1627,7 +1627,7 @@ def delete_project_role(project, request):
                     "target_user": role.user.username,
                 },
             )
-            
+
             owner_roles = (
                 request.db.query(Role)
                 .filter(Role.project == project)
@@ -1644,10 +1644,7 @@ def delete_project_role(project, request):
             )
 
             send_removed_as_collaborator_email(
-                request,
-                role.user,
-                submitter=request.user,
-                project_name=project.name,
+                request, role.user, submitter=request.user, project_name=project.name,
             )
 
             request.session.flash("Removed role", queue="success")

warehouse/templates/email/collaborator-removed/body.html

@@ -1,45 +1,45 @@
 {#
-    # Licensed under the Apache License, Version 2.0 (the "License");
-    # you may not use this file except in compliance with the License.
-    # You may obtain a copy of the License at
-    #
-    # http://www.apache.org/licenses/LICENSE-2.0
-    #
-    # Unless required by applicable law or agreed to in writing, software
-    # distributed under the License is distributed on an "AS IS" BASIS,
-    # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    # See the License for the specific language governing permissions and
-    # limitations under the License.
-   -#}
-   {% extends "email/_base/body.html" %}
-   {% set site = request.registry.settings["site.name"] %}
-   
-   
-   {% block extra_style %}
-   ul.collaborator-details {
-       list-style-type: none;
-   }
-   {% endblock %}
-   
-   
-   {% block content %}
-   <p>
-     {% trans username=username, project=project, submitter=submitter, site=site %}
-     A collaborator was removed from a project you own on {{ site }}:
-   
-     <ul class="collaborator-details">
-       <li><strong>Username</strong>: {{ username }}</li>
-       <li><strong>Collaborator for</strong>: {{ project }}</li>
-       <li><strong>Removed by</strong>: {{ submitter }}</li>
-     </ul>
-   </p>
-   {% endtrans %}
-   
-   <p>{% trans admin_mail="mailto:[email protected]" %}If this was a mistake, you can email <a href="{{ admin_mail }}">[email protected]</a> to communicate with the PyPI administrators.{% endtrans %}</p>
-   {% endblock %}
-   
-   
-   {% block reason %}
-   {% trans %}You are receiving this because you are an owner of this project.{% endtrans %}
-   {% endblock %}
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+-#}
+{% extends "email/_base/body.html" %}
+{% set site = request.registry.settings["site.name"] %}
+
+
+{% block extra_style %}
+ul.collaborator-details {
+    list-style-type: none;
+}
+{% endblock %}
+
+
+{% block content %}
+<p>
+  {% trans username=username, project=project, submitter=submitter, site=site %}
+  A collaborator was removed from a project you own on {{ site }}:
+
+  <ul class="collaborator-details">
+    <li><strong>Username</strong>: {{ username }}</li>
+    <li><strong>Collaborator for</strong>: {{ project }}</li>
+    <li><strong>Removed by</strong>: {{ submitter }}</li>
+  </ul>
+</p>
+{% endtrans %}
+
+<p>{% trans admin_mail="mailto:[email protected]" %}If this was a mistake, you can email <a href="{{ admin_mail }}">[email protected]</a> to communicate with the PyPI administrators.{% endtrans %}</p>
+{% endblock %}
+
+
+{% block reason %}
+{% trans %}You are receiving this because you are an owner of this project.{% endtrans %}
+{% endblock %}