Merge branch 'heinzel' of python/django-test into master

.buildbot/test/50-django_testrunner.sh

@@ -1 +1 @@
-coverage manage.py test
+coverage run manage.py test

apps/base/tests/test_views.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 import datetime
+import mock
 import re
 import socket
 import unittest
 from django.test import SimpleTestCase
-from unittest import mock
 
 from ..views import RootView
 

requirements.txt

@@ -1,3 +1,4 @@
 coverage
 django
 django-extensions
+mock