diff --git a/.travis.yml b/.travis.yml index 376cccd..bb7f682 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,12 @@ language: python python: - - 2.7 - - 3.3 - - 3.4 + - "2.6" + - "2.7" + - "3.2" + - "3.3" + - "3.4" + - "pypy" env: - DJANGO=Django==1.4.16 diff --git a/defender/connection.py b/defender/connection.py index d502db9..2e405f4 100644 --- a/defender/connection.py +++ b/defender/connection.py @@ -35,7 +35,6 @@ def parse_redis_url(url): return config url = urlparse.urlparse(url) - print url # Remove query strings. path = url.path[1:] path = path.split('?', 2)[0] diff --git a/defender/tests.py b/defender/tests.py index a9f38b4..447d8be 100644 --- a/defender/tests.py +++ b/defender/tests.py @@ -226,7 +226,7 @@ class AccessAttemptTest(TestCase): self.assertEquals(utils.is_valid_ip(''), False) def test_parse_redis_url(self): - """ """ + """ test the parse_redis_url method """ # full regular conf = parse_redis_url("redis://user:password@localhost2:1234/2") self.assertEquals(conf.get('HOST'), 'localhost2') @@ -243,7 +243,6 @@ class AccessAttemptTest(TestCase): # no user name conf = parse_redis_url("redis://password@localhost2:1234/2") - print conf self.assertEquals(conf.get('HOST'), 'localhost2') self.assertEquals(conf.get('DB'), 2) self.assertEquals(conf.get('PASSWORD'), None) @@ -251,7 +250,6 @@ class AccessAttemptTest(TestCase): # no user name 2 with colon conf = parse_redis_url("redis://:password@localhost2:1234/2") - print conf self.assertEquals(conf.get('HOST'), 'localhost2') self.assertEquals(conf.get('DB'), 2) self.assertEquals(conf.get('PASSWORD'), 'password') diff --git a/setup.py b/setup.py index 543cbfd..7be4cbe 100644 --- a/setup.py +++ b/setup.py @@ -20,11 +20,18 @@ setup(name='django-defender', 'License :: OSI Approved :: Apache 2 License', 'Operating System :: OS Independent', 'Programming Language :: Python', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.2', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: Implementation :: PyPy', + 'Programming Language :: Python :: Implementation :: CPython', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Security', 'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries :: Python Modules', ], - keywords='django, cache, security, authentication', + keywords='django, cache, security, authentication, throttle, login', author='Ken Cochrane', url='https://github.com/kencochrane/django-defender', author_email='kencochrane@gmail.com',