Merge pull request #16 from Bouke/patches/2

Python 3 compatibility

Author: aaugustin

djangobench/base_settings.py

@@ -1,3 +1,5 @@
+ALLOWED_HOSTS = ['*']
+
 DATABASE_ENGINE = 'sqlite3'
 DATABASE_NAME = ':memory:'
 
@@ -8,4 +10,4 @@
     },
 }
 
-SECRET_KEY = "NOT REALLY SECRET"
+SECRET_KEY = "NOT REALLY SECRET"

djangobench/benchmarks/default_middleware/benchmark.py

@@ -1,5 +1,3 @@
-from time import time
-
 from django.test.client import Client, FakePayload
 from django.conf import global_settings
 from django.conf import settings
@@ -8,6 +6,7 @@
 
 from djangobench.utils import run_comparison_benchmark
 
+
 class RequestFactory(Client):
     """
     Class that lets you create mock Request objects for use in testing.
@@ -33,7 +32,7 @@ def request(self, **request):
         has created it.
         """
         environ = {
-            'HTTP_COOKIE': self.cookies,
+            'HTTP_COOKIE': self.cookies.output(header='', sep='; '),
             'PATH_INFO': '/',
             'QUERY_STRING': '',
             'REQUEST_METHOD': 'GET',
@@ -48,6 +47,7 @@ def request(self, **request):
 
         return WSGIRequest(environ)
 
+
 def setup():
     global req_factory, handler_default_middleware, handler_no_middleware
     req_factory = RequestFactory()
@@ -60,27 +60,31 @@ def setup():
     handler_no_middleware = WSGIHandler()
     handler_no_middleware.load_middleware()
 
+
 def benchmark_request(middleware_classes):
     settings.MIDDLEWARE_CLASSES = middleware_classes
     req_factory = RequestFactory()
     handler = WSGIHandler()
     handler.load_middleware()
     handler.get_response(req_factory.get('/'))
 
+
 def benchmark_default_middleware():
     global req_factory, handler_default_middleware
     handler_default_middleware.get_response(req_factory.get('/'))
 
+
 def benchmark_no_middleware():
     global req_factory, handler_no_middleware
     handler_no_middleware.get_response(req_factory.get('/'))
 
+
 run_comparison_benchmark(
     benchmark_default_middleware,
     benchmark_no_middleware, 
-    setup = setup,
-    syncdb = False,
-    meta = {
+    setup=setup,
+    syncdb=False,
+    meta={
         'description': 'Request/response overhead added by the default middleware.',
     }
-)
+)

djangobench/benchmarks/l10n_render/settings.py

@@ -1,8 +1,10 @@
-from unipath import FSPath as Path
+import os
+
 from djangobench.base_settings import *
 
 USE_I18N = False
 USE_L10N = True
-
-TEMPLATE_DIRS = [Path(__file__).parent.child('templates').absolute()]
+TEMPLATE_DIRS = (
+    os.path.abspath(os.path.join(os.path.dirname(__file__), 'templates')),
+)
 INSTALLED_APPS = ['l10n_render']

djangobench/benchmarks/query_exists/benchmark.py

@@ -1,6 +1,7 @@
 from djangobench.utils import run_benchmark
 from query_exists.models import Book
 
+
 def benchmark():
     #Checking for object that exists
     Book.objects.filter(id=1).exists()
@@ -11,9 +12,9 @@ def benchmark():
 if hasattr(Book.objects, 'exists'):
     run_benchmark(
         benchmark,
-        meta = {
+        meta={
             'description': 'A Model.objects.exists() call for both existing and non-existing objects.'
         }
     )
 else:
-    print "SKIP: Django before 1.2 doesn't have QuerySet.exists()"
+    print("SKIP: Django before 1.2 doesn't have QuerySet.exists()")

djangobench/benchmarks/query_get_or_create/benchmark.py

@@ -4,9 +4,10 @@
 
 counter = itertools.count(1)
 
+
 def benchmark():
-    nextid = counter.next()
-    
+    nextid = next(counter)
+
     # This will do a create ...
     Book.objects.get_or_create(id=nextid, defaults={'title': 'hi'})
 
@@ -15,7 +16,8 @@ def benchmark():
 
 run_benchmark(
     benchmark,
-    meta = {
-        'description': 'A Model.objects.get_or_create() call, both for existing and non-existing objects.',
+    meta={
+        'description': 'A Model.objects.get_or_create() call, both for '
+                       'existing and non-existing objects.',
     }
 )

djangobench/benchmarks/query_prefetch_related/benchmark.py

@@ -2,11 +2,13 @@
 from django import VERSION
 from query_prefetch_related.models import Book, Author
 
+
 def benchmark():
-    for i in xrange(10):
+    for i in range(10):
         for a in Author.objects.prefetch_related('books'):
             list(a.books.all())
 
+
 def setup():
     for i in range(0, 20):
         a = Author.objects.create(author="Author %s" % i)
@@ -22,7 +24,7 @@ def setup():
     run_benchmark(
         benchmark,
         setup=setup,
-        meta = {
+        meta={
             'description': 'A simple Model.objects.select_related() call.',
         }
     )

djangobench/benchmarks/query_select_related/benchmark.py

@@ -1,13 +1,14 @@
 from djangobench.utils import run_benchmark
 from query_select_related.models import Book
 
+
 def benchmark():
-    for i in xrange(20):
+    for i in range(20):
         list(Book.objects.select_related('author'))
 
 run_benchmark(
     benchmark,
-    meta = {
+    meta={
         'description': 'A simple Model.objects.select_related() call.',
     }
 )

djangobench/benchmarks/template_render/benchmark.py

@@ -49,8 +49,8 @@ def benchmark_django_gt_13():
 
 run_benchmark(
     benchmark_django_gt_13 if VERSION > (1, 3) else benchmark_django_lte_13,
-    syncdb = False,
-    meta = {
+    syncdb=False,
+    meta={
         'description': ('Render a somewhat complex, fairly typical template '
                         '(including inheritance, reverse URL resolution, etc.).'),
     }

djangobench/benchmarks/template_render/settings.py

@@ -1,6 +1,9 @@
-from unipath import FSPath as Path
+import os
+
 from djangobench.base_settings import *
 
 INSTALLED_APPS = ['template_render']
-TEMPLATE_DIRS = [Path(__file__).parent.child('templates').absolute()]
+TEMPLATE_DIRS = (
+    os.path.abspath(os.path.join(os.path.dirname(__file__), 'templates')),
+)
 ROOT_URLCONF = 'template_render.urls'