Skip to content

Commit

Permalink
Link to redis:// & rediss:// scheme IANA registrations in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
cvrebert committed Aug 13, 2015
1 parent 81429b4 commit 6900296
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
5 changes: 4 additions & 1 deletion redis/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,10 @@ class StrictRedis(object):
@classmethod
def from_url(cls, url, db=None, **kwargs):
"""
Return a Redis client object configured from the given URL.
Return a Redis client object configured from the given URL, which must
use either `the ``redis://`` scheme
<http://www.iana.org/assignments/uri-schemes/prov/redis>`_ for RESP
connections or the ``unix://`` scheme for Unix domain sockets.
For example::
Expand Down
11 changes: 8 additions & 3 deletions redis/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -742,9 +742,14 @@ def from_url(cls, url, db=None, decode_components=False, **kwargs):
unix://[:password]@/path/to/socket.sock?db=0
Three URL schemes are supported:
redis:// creates a normal TCP socket connection
rediss:// creates a SSL wrapped TCP socket connection
unix:// creates a Unix Domain Socket connection
- ```redis://``
<http://www.iana.org/assignments/uri-schemes/prov/redis>`_ creates a
normal TCP socket connection
- ```rediss://``
<http://www.iana.org/assignments/uri-schemes/prov/rediss>`_ creates a
SSL wrapped TCP socket connection
- ``unix://`` creates a Unix Domain Socket connection
There are several ways to specify a database number. The parse function
will return the first specified option:
Expand Down

0 comments on commit 6900296

Please sign in to comment.