diff --git a/.travis.yml b/.travis.yml index bb7f682..e5cf622 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: - "3.3" - "3.4" - "pypy" + - "pypy3" env: - DJANGO=Django==1.4.16 diff --git a/README.md b/README.md index 08c26cd..1f1ed73 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ requirements - django: 1.4.x, 1.6.x, 1.7.x - redis - +- python: 2.6.x, 2.7.x, 3.2.x, 3.3.x, 3.4.x, PyPy, PyPy3 How it works ============ diff --git a/defender/connection.py b/defender/connection.py index 2e405f4..eb196d5 100644 --- a/defender/connection.py +++ b/defender/connection.py @@ -2,7 +2,7 @@ import redis try: import urlparse except ImportError: - import urllib.parse as urlparse + import urllib.parse as urlparse # pragma: no cover from . import config diff --git a/defender/tests.py b/defender/tests.py index 447d8be..e4b2064 100644 --- a/defender/tests.py +++ b/defender/tests.py @@ -9,22 +9,21 @@ from django.test import TestCase from django.contrib.auth.models import User from django.core.urlresolvers import NoReverseMatch from django.core.urlresolvers import reverse -from django.conf import settings from .connection import parse_redis_url from . import utils from . import config -if config.MOCK_REDIS: - redis_client = mockredis.mock_strict_redis_client() -else: - from .connection import get_redis_connection - redis_client = get_redis_connection() +if config.MOCK_REDIS: # pragma: no cover + redis_client = mockredis.mock_strict_redis_client() # pragma: no cover +else: # pragma: no cover + from .connection import get_redis_connection # pragma: no cover + redis_client = get_redis_connection() # pragma: no cover # Django >= 1.7 compatibility try: - ADMIN_LOGIN_URL = reverse('admin:login') LOGIN_FORM_KEY = '
' + ADMIN_LOGIN_URL = reverse('admin:login') except NoReverseMatch: ADMIN_LOGIN_URL = reverse('admin:index') LOGIN_FORM_KEY = 'this_is_the_login_form' @@ -128,7 +127,7 @@ class AccessAttemptTest(TestCase): if config.MOCK_REDIS: # mock redis require that we expire on our own - redis_client.do_expire() + redis_client.do_expire() # pragma: no cover # It should be possible to login again, make sure it is. self.test_valid_login()