From 2e1b1e0d40525b78c029a8c5f5a6314a11cc4759 Mon Sep 17 00:00:00 2001
From: Nikolay Zhuravlev <zhnick@yandex-team.ru>
Date: Thu, 7 Dec 2023 00:55:02 +0100
Subject: [PATCH] itervalues -> values; iteritems -> items

---
 anytask/anycontest/management/commands/check_contest.py  | 2 +-
 anytask/courses/templates/courses/settings.html          | 4 ++--
 anytask/courses/templates/courses/tasklist/shad_cpp.html | 2 +-
 anytask/issues/views.py                                  | 2 +-
 anytask/mail/templates/mail.html                         | 2 +-
 anytask/staff/templates/staff.html                       | 6 +++---
 anytask/tasks/templates/email_notification_task.html     | 4 ++--
 anytask/tasks/templates/email_notification_task.txt      | 4 ++--
 anytask/users/templates/user_courses.html                | 2 +-
 deploy_local_beta/settings.sh                            | 2 +-
 easyci/easy_ci_robot.py                                  | 4 ++--
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/anytask/anycontest/management/commands/check_contest.py b/anytask/anycontest/management/commands/check_contest.py
index 991901dc3..fc7d27a6e 100644
--- a/anytask/anycontest/management/commands/check_contest.py
+++ b/anytask/anycontest/management/commands/check_contest.py
@@ -34,7 +34,7 @@ def handle(self, **options):
             except Exception as e:
                 logger.exception(e)
 
-        # for contest_id, students_info in contest_marks.iteritems():
+        # for contest_id, students_info in contest_marks.items():
         #     set_contest_marks(contest_id, students_info)
 
         # logging to cron log
diff --git a/anytask/courses/templates/courses/settings.html b/anytask/courses/templates/courses/settings.html
index d176e114e..0d3a63b80 100644
--- a/anytask/courses/templates/courses/settings.html
+++ b/anytask/courses/templates/courses/settings.html
@@ -240,7 +240,7 @@ <h5 class="card-title">{% trans "jakontest" %}</h5>
                                 <div class="form-group row" style="display: none;" >
                                     <div class="controls col-lg-8 col-md-12">
                                         <select name="tasks_with_contest_rejudge[]" id="tasks_with_contest_rejudge_select" class="form-control" multiple="multiple">
-                                            {% for contest_id, tasks in tasks_with_contest.iteritems %}
+                                            {% for contest_id, tasks in tasks_with_contest.items %}
                                                 <optgroup label="{{ contest_id }}">
                                                     {% for task in tasks %}
                                                         <option value="{{ task.id }}" selected>{% get_text_from_json task 'get_title' LANGUAGE_CODE %}</option>
@@ -261,7 +261,7 @@ <h5 class="card-title">{% trans "jakontest" %}</h5>
                                 <div class="form-group row" style="display: none;" >
                                     <div class="controls col-lg-8 col-md-12">
                                         <select name="tasks_with_contest[]" id="tasks_with_contest_select" class="form-control" multiple="multiple">
-                                            {% for contest_id, tasks in tasks_with_contest.iteritems %}
+                                            {% for contest_id, tasks in tasks_with_contest.items %}
                                                 <optgroup label="{{ contest_id }}">
                                                     {% for task in tasks %}
                                                         <option value="{{ task.id }}" selected>{% get_text_from_json task 'get_title' LANGUAGE_CODE %}</option>
diff --git a/anytask/courses/templates/courses/tasklist/shad_cpp.html b/anytask/courses/templates/courses/tasklist/shad_cpp.html
index 6049c7c9f..7aa804f84 100644
--- a/anytask/courses/templates/courses/tasklist/shad_cpp.html
+++ b/anytask/courses/templates/courses/tasklist/shad_cpp.html
@@ -193,7 +193,7 @@ <h4 class="modal-title" id="modal_table_edit_header">{% trans "itogovaja_tablica
                 </div>
                 <div class="modal-body">
                     <p>{% trans "izmenenie_udalenie_zadach" %}</p>
-                    {% for group, tasks in group_tasks.iteritems %}
+                    {% for group, tasks in group_tasks.items %}
                         <div id="group_sort_{{ group.id }}" data-group="{{ group.id }}" data-table="#table_results_{{ group.id }}" data-marksystem="{% if course_mark_system_vals %}true{% endif %}" class="collapse">
                             <p  class="modal-group-name">{{ group.name }}</p>
                             <ul class="group-sortable" name="group_sort_{{ group.id }}">
diff --git a/anytask/issues/views.py b/anytask/issues/views.py
index 7ce232724..2a8e1c1c2 100644
--- a/anytask/issues/views.py
+++ b/anytask/issues/views.py
@@ -210,7 +210,7 @@ def issue_page(request, issue_id):
                         'comment': value,
                         'files': request.FILES.getlist('files')
                     }
-                    if 'need_info' in request.POST and any(value.itervalues()):
+                    if 'need_info' in request.POST and any(value.values()):
                         issue.set_status_need_info()
 
                 issue.set_field(field, value, request.user)
diff --git a/anytask/mail/templates/mail.html b/anytask/mail/templates/mail.html
index 1ec207903..10119e2fa 100644
--- a/anytask/mail/templates/mail.html
+++ b/anytask/mail/templates/mail.html
@@ -192,7 +192,7 @@ <h4 class="modal-title">{% trans "dobavit_gruppu_polzovatelej" %}</h4>
                                             </div>
                                             <div class="tab-pane fade" id="statuses" role="tabpanel">
                                                 <select id="modal_add_status_select" multiple>
-                                                    {% for status_type, status_values in user_statuses.iteritems %}
+                                                    {% for status_type, status_values in user_statuses.items %}
                                                         <optgroup data-not_selectable="1" label="{% if status_type %}{{ status_values.type_name }}{% else %}{% trans "bez_tipa" %}{% endif %}">
                                                             {% for status_info in status_values.values %}
                                                                 <option value="{{ status_info.id }}" data-id="{{ status_info.id }}" data-type="status">{{ status_info.name }}</option>
diff --git a/anytask/staff/templates/staff.html b/anytask/staff/templates/staff.html
index ffe59de59..d8f701fe0 100644
--- a/anytask/staff/templates/staff.html
+++ b/anytask/staff/templates/staff.html
@@ -91,7 +91,7 @@ <h5 class="card-title">{% trans "polzovateli" %}</h5>
                                 </tr>
                                 </thead>
                                 <tbody>
-                                {% for id_user, user_info in filter.users_info.iteritems %}
+                                {% for id_user, user_info in filter.users_info.items %}
                                     <tr data-id_user="{{ id_user }}" data-id_profile="{{ user_info.id_profile }}">
                                         <td>
                                             <input type='checkbox' class='table-checkbox'>
@@ -101,7 +101,7 @@ <h5 class="card-title">{% trans "polzovateli" %}</h5>
                                         </td>
                                         <td title="{{ user_info.email }}">{{ user_info.email }}</td>
                                         <td>
-                                            {% for id_status, status_info in user_info.statuses.iteritems %}
+                                            {% for id_status, status_info in user_info.statuses.items %}
                                                 <span class="label" title="{{ status_info.name }}" style="background-color: {{ status_info.color }}">{{ status_info.name }}</span>
                                             {% endfor %}
                                         </td>
@@ -134,7 +134,7 @@ <h4 class="modal-title">{% trans "redaktirovanie_statusov" %}</h4>
                     <p>{% trans "vybrano_polzovateley" %}&nbsp;<span class="selected_users_count"></span>.</p>
                     <form id="form_change_status">
                         {% csrf_token %}
-                        {% for status_type, status_values in statuses.iteritems %}
+                        {% for status_type, status_values in statuses.items %}
                             <fieldset class="form-group">
                                 <label class="status-type-label" data-type="{{ status_type }}">
                                     {% if status_type %}
diff --git a/anytask/tasks/templates/email_notification_task.html b/anytask/tasks/templates/email_notification_task.html
index a332a39b1..5490f7047 100644
--- a/anytask/tasks/templates/email_notification_task.html
+++ b/anytask/tasks/templates/email_notification_task.html
@@ -13,7 +13,7 @@
                 </p>
             </td>
         </tr>
-        {% for key_course, tasks_info in courses_info.iteritems %}
+        {% for key_course, tasks_info in courses_info.items %}
             {% if key_course != 'user' %}
                 <tr>
                     <td>
@@ -26,7 +26,7 @@
                                 >"{{ course.name }}"</a>
                                 {% trans "proizoshli_izmeneniya" %}:
                                 <ul style="margin:0;text-align: justify">
-                                    {% for key_task, task_info in tasks_info.iteritems %}
+                                    {% for key_task, task_info in tasks_info.items %}
                                         {% if key_task != 'course' %}
                                             <li>
                                                 {% if task_info.1 %}
diff --git a/anytask/tasks/templates/email_notification_task.txt b/anytask/tasks/templates/email_notification_task.txt
index 1cf0b68bd..35483d0ee 100644
--- a/anytask/tasks/templates/email_notification_task.txt
+++ b/anytask/tasks/templates/email_notification_task.txt
@@ -1,7 +1,7 @@
 {% load i18n %}{% load dict_func %}{% load info %}
 {% trans "zdravstvujte" %}, {{ user.get_full_name }}!
-{% for key_course, tasks_info in courses_info.iteritems %}{% if key_course != 'user' %}{% with course=tasks_info|key:"course" %}
-{% trans "v_kurse" %} "{{ course.name }}" {% trans "proizoshli_izmeneniya" %}:{% for key_task, task_info in tasks_info.iteritems %}{% if key_task != 'course' %}
+{% for key_course, tasks_info in courses_info.items %}{% if key_course != 'user' %}{% with course=tasks_info|key:"course" %}
+{% trans "v_kurse" %} "{{ course.name }}" {% trans "proizoshli_izmeneniya" %}:{% for key_task, task_info in tasks_info.items %}{% if key_task != 'course' %}
     - {% if task_info.1 %}{% trans 'dobavlena_zadacha' %} "{% get_text_from_json task_info.0 'get_title' LANGUAGE_CODE %}"{% else %}{% filter lower %}{% trans 'v_zadache' %}{% endfilter %} "{% get_text_from_json task_info.0 'get_title' LANGUAGE_CODE %}" {% trans 'izmenilis' %}: {{ task_info|slice:"2:"|join:", " }}{% endif %}{% endif %}{% endfor %}
 {% trans 'pereyti_v_kurs' %}: {{ domain }}{{ course.get_absolute_url }}{% endwith %}
 {% endif %}{% endfor %}
diff --git a/anytask/users/templates/user_courses.html b/anytask/users/templates/user_courses.html
index 7e948d669..a17d9c28f 100644
--- a/anytask/users/templates/user_courses.html
+++ b/anytask/users/templates/user_courses.html
@@ -83,7 +83,7 @@ <h5 class="card-title">
                                 {% for year, courses_in_year in table %}
                                     <div class="tab-pane fade {% if year == current_year or forloop.last and not table|has_item:current_year  %}in active{% endif %}" id="{% if forloop.parentloop.first %}courses_{% else %}courses_archive_{% endif %}{{ forloop.counter }}" role="tabpanel">
                                         <div class="card-block">
-                                            {% for table_id, course_statistics in courses_in_year.iteritems %}
+                                            {% for table_id, course_statistics in courses_in_year.items %}
                                                 <div class="card-table">
                                                     <table class="table table_courses">
                                                         <thead>
diff --git a/deploy_local_beta/settings.sh b/deploy_local_beta/settings.sh
index 3b971ae05..87e75c6b1 100755
--- a/deploy_local_beta/settings.sh
+++ b/deploy_local_beta/settings.sh
@@ -10,7 +10,7 @@ fi
 export ANYBETA_ROOT=$PWD
 export ANYBETA_DEPLOY="$PWD/deploy_local_beta"
 
-export ANYBETA_PYTHON_PATH="`which python3`"
+export ANYBETA_PYTHON_PATH="/Users/zhnick/.pyenv/versions/3.8.18/bin/python3"
 
 export ANYBETA_VENV_NAME="anytask_venv"
 export ANYBETA_VENV_DIR="$ANYBETA_ROOT/$ANYBETA_VENV_NAME"
diff --git a/easyci/easy_ci_robot.py b/easyci/easy_ci_robot.py
index d6bc4a236..82734204d 100755
--- a/easyci/easy_ci_robot.py
+++ b/easyci/easy_ci_robot.py
@@ -169,13 +169,13 @@ def main():
     pool = Pool(processes=PROCS)
 
     logging.info("Queue:")
-    for qtask in queue.itervalues():
+    for qtask in queue.values():
         logging.info("%s\t%s\t%s\t%s\t%s\t%s", qtask.host, qtask.course["course_id"], qtask.id, qtask.task["title"],
                      qtask.issue["student"]["username"], "{}/issue/{}".format(qtask.host, qtask.issue["id"]))
     if "--only_queue" in sys.argv:
         sys.exit(0)
 
-    for qtask in pool.imap_unordered(proccess_task, queue.itervalues()):
+    for qtask in pool.imap_unordered(proccess_task, queue.values()):
         logging.info(" == Parralel Task %d DONE!, URL: %s/issue/%d", qtask.id, qtask.host, qtask.issue["id"])
 
     logging.info("All DONE!")