Skip to content

Commit

Permalink
removed the extra print statments
Browse files Browse the repository at this point in the history
  • Loading branch information
kencochrane committed Jan 1, 2015
1 parent a8e721d commit 84e4105
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion defender/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 1 addition & 3 deletions defender/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ def test_is_valid_ip(self):
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')
Expand All @@ -243,15 +243,13 @@ def test_parse_redis_url(self):

# 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)
self.assertEquals(conf.get('PORT'), 1234)

# 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')
Expand Down
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@
'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',
Expand Down

0 comments on commit 84e4105

Please sign in to comment.