Skip to content

Commit 2edaf74

Browse files
committed
Merge branch 'Alireza2n-develop' into develop
2 parents 5d84839 + a539c86 commit 2edaf74

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ lib64/
1919
parts/
2020
sdist/
2121
var/
22+
/.idea
23+
.venv
2224
*.egg-info/
2325
.installed.cfg
2426
*.egg

maintenancemode/middleware.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
# -*- coding: utf-8 -*-
22

33
import re
4-
import django
54

65
from django.conf import urls
76
from django.urls import get_resolver
8-
try:
9-
from django.utils.deprecation import MiddlewareMixin
10-
except ImportError:
11-
# Compatibility for older version of Django
12-
MiddlewareMixin = object
13-
14-
from .conf import settings
15-
from . import utils as maintenance
167
from django.utils.deprecation import MiddlewareMixin
178

9+
from . import utils as maintenance
10+
from .conf import settings
11+
1812
urls.handler503 = 'maintenancemode.views.temporary_unavailable'
1913
urls.__all__.append('handler503')
2014

@@ -58,11 +52,8 @@ def process_request(self, request):
5852
return None
5953

6054
# Otherwise show the user the 503 page
61-
resolver = get_resolver(None)
55+
resolver = get_resolver()
6256

63-
if django.VERSION < (1, 8):
64-
callback, param_dict = resolver._resolve_special('503')
65-
else:
66-
callback, param_dict = resolver.resolve_error_handler('503')
57+
callback, param_dict = resolver.resolve_error_handler('503')
6758

6859
return callback(request, **param_dict)

0 commit comments

Comments
 (0)