From d4512da049ef74ded0d5a57763e50192f4a18e0f Mon Sep 17 00:00:00 2001 From: bashmak Date: Wed, 23 Aug 2017 16:57:04 +0300 Subject: [PATCH] replaces import setting directly, to django.conf settigs. And use getattr. --- abonapp/pay_systems.py | 4 +++- agent/mod_mikrotik.py | 4 ++-- chatbot/models.py | 4 +++- mydefs.py | 5 ++++- photo_app/models.py | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/abonapp/pay_systems.py b/abonapp/pay_systems.py index 4835348..c159507 100644 --- a/abonapp/pay_systems.py +++ b/abonapp/pay_systems.py @@ -3,9 +3,11 @@ from django.utils import timezone from mydefs import safe_int, safe_float from .models import Abon, AllTimePayLog from django.db import DatabaseError +from django.conf import settings -from djing.settings import pay_SECRET as SECRET, pay_SERV_ID as SERV_ID +SECRET = getattr(settings, 'pay_SECRET') +SERV_ID = getattr(settings, 'pay_SERV_ID') #?ACT=1&PAY_ACCOUNT=960849&SERVICE_ID=y832r92y8f9e&PAY_ID=3561234&TRADE_POINT=377&SIGN=32e533a72389fe4e93746509f9d672f8 diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index 1924b14..31c3cb7 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -7,11 +7,11 @@ from .core import BaseTransmitter, NasFailedResult, NasNetworkError from mydefs import ping from .structs import TariffStruct, AbonStruct, IpStruct from . import settings -from djing.settings import DEBUG +from django.conf import settings import re -#DEBUG=True +DEBUG = getattr(settings, 'DEBUG', False) LIST_USERS_ALLOWED = 'DjingUsersAllowed' LIST_USERS_BLOCKED = 'DjingUsersBlocked' diff --git a/chatbot/models.py b/chatbot/models.py index 550924f..27726ee 100644 --- a/chatbot/models.py +++ b/chatbot/models.py @@ -1,5 +1,7 @@ from django.db import models -from djing.settings import AUTH_USER_MODEL +from django.conf import settings + +AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL') class ChatException(Exception): diff --git a/mydefs.py b/mydefs.py index 7eea08a..a428a6c 100644 --- a/mydefs.py +++ b/mydefs.py @@ -10,9 +10,12 @@ from django.http import HttpResponse, Http404, HttpResponseRedirect from django.shortcuts import redirect from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage from django.db import models -from djing.settings import PAGINATION_ITEMS_PER_PAGE, DEBUG +from django.conf import settings +PAGINATION_ITEMS_PER_PAGE = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10) +DEBUG = getattr(settings, 'DEBUG', False) + ip_addr_regex = r'^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$' diff --git a/photo_app/models.py b/photo_app/models.py index 5f33500..fc7f8eb 100644 --- a/photo_app/models.py +++ b/photo_app/models.py @@ -5,8 +5,9 @@ import hashlib from django.db import models from PIL import Image +from django.conf import settings -from djing.settings import BASE_DIR +BASE_DIR = getattr(settings, 'BASE_DIR', '.') class Photo(models.Model):