resolve conflict

101t · 101t · commit 44fd0b36cc23 · 2021-11-05T05:40:06.000+03:00
diff --git a/config/settings/com.py b/config/settings/com.py
@@ -157,4 +157,4 @@
 DEFAULT_USER_AVATAR = STATIC_URL + "assets/img/user.png"
 DEFAULT_USER_FOLDER = "users"
 
-X_FRAME_OPTIONS = 'SAMEORIGIN'  # Django-JET admin popup required
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
diff --git a/main/core/admin/adminsite.py b/main/core/admin/adminsite.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from django.utils.translation import gettext_lazy as _
+from django.contrib import admin
 from django.contrib.admin import AdminSite
 from django.conf import settings
 
diff --git a/main/core/admin/currency.py b/main/core/admin/currency.py
@@ -1,4 +1,5 @@
-from django.contrib import admin
+from django.utils.translation import gettext, gettext_lazy as _
+from django.contrib import admin, messages
 
 from ..models import Currency
 
diff --git a/main/core/admin/emailserver.py b/main/core/admin/emailserver.py
@@ -1,3 +1,6 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext_lazy as _
 from django.contrib import admin
 
 from ..models import EmailServer
diff --git a/main/core/admin/tokenizer.py b/main/core/admin/tokenizer.py
@@ -1,3 +1,6 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext_lazy as _
 from django.contrib import admin
 
 from ..models import Tokenizer
diff --git a/main/core/apps.py b/main/core/apps.py
@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class CoreConfig(AppConfig):
diff --git a/main/core/context_processors.py b/main/core/context_processors.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
 
diff --git a/main/core/mailer/mail_modules.py b/main/core/mailer/mail_modules.py
@@ -5,6 +5,8 @@
 """
 
 from django.template.loader import render_to_string
+from django.conf import settings as django_settings
+from django.utils.translation import gettext_lazy as _
 
 from main.core.models import EmailServer
 
diff --git a/main/core/models/currency.py b/main/core/models/currency.py
@@ -1,4 +1,8 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.core.exceptions import ValidationError
 from django.db import models
 
 from autoslug import AutoSlugField
diff --git a/main/core/models/emailserver.py b/main/core/models/emailserver.py
@@ -1,4 +1,7 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ValidationError
 from django.db import models
 
 from .timestamped import TimeStampedModel
diff --git a/main/core/models/guid.py b/main/core/models/guid.py
@@ -1,4 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
 from django.db import models
 from uuid import uuid4
 
diff --git a/main/core/models/timestamped.py b/main/core/models/timestamped.py
@@ -1,4 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
 from django.db import models
 from django.utils import timezone
 from django.utils.timesince import timesince
diff --git a/main/core/tasks/mail_html.py b/main/core/tasks/mail_html.py
@@ -1,4 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+from django.utils.translation import gettext_lazy as _
 from django.utils import translation
 from django.template.loader import render_to_string
 from django.conf import settings
diff --git a/main/core/utils/boolean.py b/main/core/utils/boolean.py
@@ -1,3 +1,8 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.conf import settings
+
 from dateutil.parser import parse
 from decimal import Decimal
 import json
diff --git a/main/core/utils/common.py b/main/core/utils/common.py
@@ -1,15 +1,16 @@
-import random
-import re
-import string
-
-from dateutil.parser import parse
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.conf import settings
 from django.contrib import messages
 from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.dateformat import DateFormat
 
 from .boolean import is_date
+import re
+import string
 
 
 def timestamp2datetime(timestamp):
@@ -21,7 +22,7 @@ def readable_date_format(datetime):
 
 
 def get_client_ip(request):
-    x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+    x_forwarded_for = request.headers.get('X-Forwarded-For')
     if x_forwarded_for:
         ip = x_forwarded_for.split(',')[0]
     else:
diff --git a/main/core/utils/cryptograph.py b/main/core/utils/cryptograph.py
@@ -1,3 +1,8 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+import base64
+from random import randint
 import hashlib
 
 
diff --git a/main/core/utils/tokens.py b/main/core/utils/tokens.py
@@ -1,3 +1,6 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.conf import settings
 
diff --git a/main/notify/admin/notification.py b/main/notify/admin/notification.py
@@ -1,4 +1,7 @@
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
+
+from main.users.models import User
 
 from ..models import Notification
 
diff --git a/main/notify/admin/request.py b/main/notify/admin/request.py
@@ -1,4 +1,6 @@
 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
+from django.db.models import Q
 
 from main.users.models import User
 
diff --git a/main/notify/apps.py b/main/notify/apps.py
@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class NotifyConfig(AppConfig):
diff --git a/main/notify/consumers/session.py b/main/notify/consumers/session.py
@@ -1,3 +1,10 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.conf import settings
+
+import asyncio
+from asgiref.sync import async_to_sync
 from channels.generic.websocket import AsyncWebsocketConsumer
 import json
 
diff --git a/main/notify/forms/request.py b/main/notify/forms/request.py
@@ -1,4 +1,6 @@
-from django.utils.translation import ugettext as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext as _
 from django import forms
 
 from main.users.models import User
diff --git a/main/notify/livecast.py b/main/notify/livecast.py
@@ -1,6 +1,8 @@
-import json
-
-from asgiref.sync import AsyncToSync
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.urls import reverse
+from asgiref.sync import async_to_sync, sync_to_async, AsyncToSync
 from channels.layers import get_channel_layer
 
 from main.core.utils import get_channel_group_name
diff --git a/main/notify/models/notification.py b/main/notify/models/notification.py
@@ -1,4 +1,7 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext_lazy as _
+from django.utils.text import slugify
 from django.db import models
 
 from main.core.models import TimeStampedModel
diff --git a/main/notify/models/request.py b/main/notify/models/request.py
@@ -1,4 +1,7 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext_lazy as _
+from django.utils.text import slugify
 from django.db import models
 from django.urls import reverse_lazy
 
diff --git a/main/notify/routing.py b/main/notify/routing.py
@@ -1,7 +1,8 @@
 # -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
-
-from django.urls import path
+from django.utils.translation import gettext_lazy as _
+from django.conf import settings
+from django.urls import include, path
 
 from main.notify.consumers import *
 
diff --git a/main/notify/tasks/sendnotification.py b/main/notify/tasks/sendnotification.py
@@ -1,4 +1,10 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.urls import reverse
+from django.utils.timezone import now
+from django.utils import timezone
+from django.db.models import Q
 
 from main.users.models import User
 from main.taskapp.celery import DEFAULT_RETRY_DELAY, MAX_RETRIES
diff --git a/main/notify/urls.py b/main/notify/urls.py
@@ -1,4 +1,8 @@
-from django.urls import path
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.urls import path,include
+from django.conf.urls import url
 
 from main.notify.views import *
 
diff --git a/main/notify/views/notify.py b/main/notify/views/notify.py
@@ -1,4 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import JsonResponse, HttpResponse
 from django.contrib.auth.decorators import login_required
diff --git a/main/users/apps.py b/main/users/apps.py
@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.apps import AuthConfig
 
 AuthConfig.verbose_name = _("Groups")
diff --git a/main/users/forms/reset.py b/main/users/forms/reset.py
@@ -1,4 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+from django.utils.translation import gettext_lazy as _
 
 from django import forms
 
diff --git a/main/users/forms/signin.py b/main/users/forms/signin.py
@@ -1,5 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
-from django.core.validators import MaxLengthValidator, MinLengthValidator
+# -*- encoding: utf-8 -*-
+from django.utils.translation import gettext_lazy as _
+from django.core.validators import MaxLengthValidator, MinLengthValidator, EmailValidator, RegexValidator
 from django import forms
 
 
diff --git a/main/users/forms/signup.py b/main/users/forms/signup.py
@@ -1,5 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
-from django.core.validators import MaxLengthValidator, MinLengthValidator
+# -*- encoding: utf-8 -*-
+from django.utils.translation import gettext_lazy as _
+from django.core.validators import MaxLengthValidator, MinLengthValidator, EmailValidator
 from django import forms
 
 
diff --git a/main/users/models/user.py b/main/users/models/user.py
@@ -1,4 +1,7 @@
-from django.utils.translation import ugettext_lazy as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.contrib.auth.models import AbstractUser
 from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin
 from django.contrib.auth.validators import ASCIIUsernameValidator
 from django.core.validators import RegexValidator, MinLengthValidator
diff --git a/main/users/urls.py b/main/users/urls.py
@@ -1,3 +1,7 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.conf.urls import url
 from django.urls import path, re_path
 from .views import (
     profile_view,
diff --git a/main/users/views/signin.py b/main/users/views/signin.py
@@ -1,4 +1,7 @@
-from django.utils.translation import ugettext as _
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext as _
+from django.shortcuts import render
 from django.contrib.auth import login, logout, authenticate
 from django.contrib import messages
 from django.shortcuts import HttpResponseRedirect, render, redirect
diff --git a/main/web/urls.py b/main/web/urls.py
@@ -1,4 +1,8 @@
-from django.urls import path
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.conf.urls import url
+from django.urls import path, re_path
 
 from .views import *
 
diff --git a/main/web/views/home.py b/main/web/views/home.py
@@ -1,8 +1,12 @@
-from django.utils.translation import ugettext_lazy as _
-from django.shortcuts import render, HttpResponse
-
-import json
-
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+from django.utils.translation import gettext_lazy as _
+from django.shortcuts import render, redirect, get_object_or_404
+from django.http import JsonResponse, HttpResponse
+from django.contrib.auth.decorators import login_required
+from django.contrib import messages
+from django.utils import timezone as djtz
+from django.conf import settings
 
 def welcome_view(request):
     import django, sys
diff --git a/requirements.txt b/requirements.txt
