Skip to content

Commit d6bb6c6

Browse files
SmileyChrisSmileyChris
authored
Merge pull request #27 from jaap3/fix_for_master
Fix djangobench for Django 1.10+. Thanks Jaap!
2 parents b52fccf + a93cfd1 commit d6bb6c6

File tree

10 files changed

+122
-40
lines changed

10 files changed

+122
-40
lines changed

‎djangobench/benchmarks/default_middleware/urls.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
try:
2-
from django.conf.urls import patterns
2+
from django.conf.urls import url
33
except ImportError:
4-
from django.conf.urls.defaults import patterns
4+
from django.conf.urls.defaults import url
55

6+
from .views import index
67

7-
urlpatterns = patterns('default_middleware',
8-
(r'^.*$', 'views.index'),
9-
)
8+
urlpatterns = [
9+
url(r'^.*$', index),
10+
]

‎djangobench/benchmarks/l10n_render/benchmark.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def make_request():
1919
'SERVER_PORT': 80,
2020
'SERVER_PROTOCOL': 'HTTP/1.1',
2121
"wsgi.input": sys.stdin
22-
}
22+
}
2323

2424
return WSGIRequest(environ)
2525

@@ -28,9 +28,9 @@ def make_request():
2828

2929

3030
def benchmark():
31-
render_to_response('list.html',
32-
{'numbers': range(0, 200)},
33-
context_instance=RequestContext(req_object))
31+
context = RequestContext(req_object)
32+
context['numbers'] = range(0, 200)
33+
render_to_response('list.html', context)
3434

3535

3636
run_benchmark(

‎djangobench/benchmarks/l10n_render/settings.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,24 @@
88
os.path.abspath(os.path.join(os.path.dirname(__file__), 'templates')),
99
)
1010
INSTALLED_APPS = ['l10n_render', 'django.contrib.auth', 'django.contrib.contenttypes']
11+
12+
TEMPLATES = [
13+
{
14+
'BACKEND': 'django.template.backends.django.DjangoTemplates',
15+
'DIRS': [
16+
os.path.abspath(os.path.join(os.path.dirname(__file__), 'templates')),
17+
],
18+
'APP_DIRS': True,
19+
'OPTIONS': {
20+
'context_processors': [
21+
'django.contrib.auth.context_processors.auth',
22+
'django.template.context_processors.debug',
23+
'django.template.context_processors.i18n',
24+
'django.template.context_processors.media',
25+
'django.template.context_processors.static',
26+
'django.template.context_processors.tz',
27+
'django.contrib.messages.context_processors.messages',
28+
],
29+
},
30+
},
31+
]

‎djangobench/benchmarks/template_compilation/settings.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
from djangobench.base_settings import *
1+
from djangobench.base_settings import *
2+
3+
TEMPLATES = [
4+
{
5+
'BACKEND': 'django.template.backends.django.DjangoTemplates',
6+
'DIRS': [],
7+
'APP_DIRS': True,
8+
'OPTIONS': {
9+
'context_processors': [
10+
'django.contrib.auth.context_processors.auth',
11+
'django.template.context_processors.debug',
12+
'django.template.context_processors.i18n',
13+
'django.template.context_processors.media',
14+
'django.template.context_processors.static',
15+
'django.template.context_processors.tz',
16+
'django.contrib.messages.context_processors.messages',
17+
],
18+
},
19+
},
20+
]

‎djangobench/benchmarks/template_render/settings.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,25 @@
77
os.path.abspath(os.path.join(os.path.dirname(__file__), 'templates')),
88
)
99
ROOT_URLCONF = 'template_render.urls'
10+
11+
12+
TEMPLATES = [
13+
{
14+
'BACKEND': 'django.template.backends.django.DjangoTemplates',
15+
'DIRS': [
16+
os.path.abspath(os.path.join(os.path.dirname(__file__), 'templates')),
17+
],
18+
'APP_DIRS': True,
19+
'OPTIONS': {
20+
'context_processors': [
21+
'django.contrib.auth.context_processors.auth',
22+
'django.template.context_processors.debug',
23+
'django.template.context_processors.i18n',
24+
'django.template.context_processors.media',
25+
'django.template.context_processors.static',
26+
'django.template.context_processors.tz',
27+
'django.contrib.messages.context_processors.messages',
28+
],
29+
},
30+
},
31+
]

‎djangobench/benchmarks/template_render/urls.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
try:
2-
from django.conf.urls import patterns, url
2+
from django.conf.urls import url
33
except ImportError:
4-
from django.conf.urls.defaults import patterns, url
4+
from django.conf.urls.defaults import url
55

6+
from .views import join, login, logout
67

7-
urlpatterns = patterns('template_render.views',
8-
url(r'/join/?$', 'join', name='join'),
9-
url(r'/login/?$', 'login', name='login'),
10-
url(r'/logout/?$', 'logout', name='logout'),
11-
)
8+
9+
urlpatterns = [
10+
url(r'/join/?$', join, name='join'),
11+
url(r'/login/?$', login, name='login'),
12+
url(r'/logout/?$', logout, name='logout'),
13+
]

‎djangobench/benchmarks/template_render_simple/settings.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
11
from djangobench.base_settings import *
2+
3+
TEMPLATES = [
4+
{
5+
'BACKEND': 'django.template.backends.django.DjangoTemplates',
6+
'DIRS': [],
7+
'APP_DIRS': True,
8+
'OPTIONS': {
9+
'context_processors': [
10+
'django.contrib.auth.context_processors.auth',
11+
'django.template.context_processors.debug',
12+
'django.template.context_processors.i18n',
13+
'django.template.context_processors.media',
14+
'django.template.context_processors.static',
15+
'django.template.context_processors.tz',
16+
'django.contrib.messages.context_processors.messages',
17+
],
18+
},
19+
},
20+
]

‎djangobench/benchmarks/url_resolve_flat/urls.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
try:
2-
from django.conf.urls import patterns, include, url
2+
from django.conf.urls import include, url
33
except ImportError:
4-
from django.conf.urls.defaults import patterns, include, url
4+
from django.conf.urls.defaults import include, url
55

66
def ok_view(request, *a, **kw):
77
pass
@@ -12,17 +12,17 @@ def handler404(request):
1212
sections = ["section%d" % i for i in range(10)]
1313
features = ["feature%d" % i for i in range(20)]
1414

15-
urlpatterns = patterns('', *[
15+
urlpatterns = [
1616
url("^%s/%s$" % (s, f), ok_view) for s in sections for f in features
17-
])
17+
]
1818

19-
urlpatterns += patterns('', *[
19+
urlpatterns += [
2020
url("^(?P<locale>en|ru)/%s$" % f, ok_view)
2121
for f in features
22-
])
22+
]
2323

24-
urlpatterns += patterns('', *[
24+
urlpatterns += [
2525
url("^(?P<user>\w+)/(?P<repo>\w+)/%s$" % f, ok_view) for f in features
26-
])
26+
]
2727

2828
# Total: 240 patterns

‎djangobench/benchmarks/url_resolve_flat_i18n_off/urls.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
try:
2-
from django.conf.urls import patterns, include, url
2+
from django.conf.urls import include, url
33
except ImportError:
4-
from django.conf.urls.defaults import patterns, include, url
4+
from django.conf.urls.defaults import include, url
55

66
def ok_view(request, *a, **kw):
77
pass
@@ -12,17 +12,17 @@ def handler404(request):
1212
sections = ["section%d" % i for i in range(10)]
1313
features = ["feature%d" % i for i in range(20)]
1414

15-
urlpatterns = patterns('', *[
15+
urlpatterns = [
1616
url("^%s/%s$" % (s, f), ok_view) for s in sections for f in features
17-
])
17+
]
1818

19-
urlpatterns += patterns('', *[
19+
urlpatterns += [
2020
url("^(?P<locale>en|ru)/%s$" % f, ok_view)
2121
for f in features
22-
])
22+
]
2323

24-
urlpatterns += patterns('', *[
24+
urlpatterns += [
2525
url("^(?P<user>\w+)/(?P<repo>\w+)/%s$" % f, ok_view) for f in features
26-
])
26+
]
2727

2828
# Total: 240 patterns

‎djangobench/benchmarks/url_resolve_nested/urls.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import string
22

33
try:
4-
from django.conf.urls import include, patterns, url
4+
from django.conf.urls import include, url
55
except ImportError:
6-
from django.conf.urls.defaults import include, patterns, url
6+
from django.conf.urls.defaults import include, url
77

88

99
def ok_view(request, *a, **kw):
@@ -12,7 +12,7 @@ def ok_view(request, *a, **kw):
1212
def handler500(request):
1313
pass
1414

15-
leaf_patterns = patterns('', url(r"^leaf$", ok_view))
15+
leaf_patterns = [url(r"^leaf$", ok_view)]
1616

1717
def int2ascii(x, mod, alphabet=string.digits + string.ascii_letters):
1818
alphabet = alphabet[:mod]
@@ -26,10 +26,8 @@ def pattern_tree(parent, height, level):
2626
if height == 0:
2727
return leaf_patterns
2828
ids = [parent + int2ascii(i, level) for i in range(level)]
29-
return patterns('',
30-
*(url("^%s/" % id_, include(pattern_tree(id_, height-1, level)))
31-
for id_ in ids)
32-
)
29+
return [url("^%s/" % id_, include(pattern_tree(id_, height-1, level)))
30+
for id_ in ids]
3331

3432
urlpatterns = pattern_tree("", 8, 2)
3533
# Total: 2**8 = 256 leafs, 511 nodes

0 commit comments

Comments
 (0)