Merge remote-tracking branch 'jparise/cls-from_url'

Conflicts:
	redis/client.py
	redis/utils.py

1 files changed, 2 insertions, 24 deletions

diff --git a/redis/utils.py b/redis/utils.py
index a9fe83b..20cef6c 100644
--- a/redis/utils.py
+++ b/redis/utils.py
@@ -1,31 +1,9 @@
 from redis.client import Redis
-from redis._compat import urlparse
 
-DEFAULT_DATABASE_ID = 0
-
-
-def from_url(url, db=None):
+def from_url(url, db=None, **kwargs):
     """Returns an active Redis client generated from the given database URL.
 
     Will attempt to extract the database id from the path url fragment, if
     none is provided.
     """
-
-    url = urlparse(url)
-
-    # Make sure it's a redis database.
-    if url.scheme:
-        assert url.scheme == 'redis'
-
-    # Attempt to resolve database id.
-    if db is None:
-        try:
-            db = int(url.path.replace('/', ''))
-        except (AttributeError, ValueError):
-            db = DEFAULT_DATABASE_ID
-
-    return Redis(
-        host=url.hostname,
-        port=url.port,
-        db=db,
-        password=url.password)
+    return Redis.from_url(url, db, **kwargs)