diff options
author | andy <andy@whiskeymedia.com> | 2013-06-06 11:30:23 -0700 |
---|---|---|
committer | andy <andy@whiskeymedia.com> | 2013-06-06 11:30:23 -0700 |
commit | 6a69aa50797f95b8fd426651ac0b27d7718036d9 (patch) | |
tree | 33bc095766d7193aabc2c7a903c00c52b64c0a8f /redis/utils.py | |
parent | a207d76939b640634095a49c4790003839a0a669 (diff) | |
download | redis-py-6a69aa50797f95b8fd426651ac0b27d7718036d9.tar.gz |
encoding tests
Diffstat (limited to 'redis/utils.py')
-rw-r--r-- | redis/utils.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/redis/utils.py b/redis/utils.py index 7c04a71..ee681bf 100644 --- a/redis/utils.py +++ b/redis/utils.py @@ -1,10 +1,16 @@ -from redis.client import Redis +try: + import hiredis + HIREDIS_AVAILABLE = True +except ImportError: + HIREDIS_AVAILABLE = False def from_url(url, db=None, **kwargs): - """Returns an active Redis client generated from the given database URL. + """ + 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. """ + from redis.client import Redis return Redis.from_url(url, db, **kwargs) |