diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-12-17 20:12:07 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-12-17 20:12:07 +0000 |
| commit | 172781e678f1414fa09cea749313619123c851c5 (patch) | |
| tree | 186b2a2d8ae6c767116e0e2b507ccd65395fc067 /lib/sqlalchemy/engine/url.py | |
| parent | 163c4819e0968007307ed3a14c22d23ef34abe1c (diff) | |
| download | sqlalchemy-172781e678f1414fa09cea749313619123c851c5.tar.gz | |
- added sphinx handler to allow __init__ methods through
- sqlite module documentation
- some corrections to pool docs
- the example in URL.translate_connect_args() never made any sense anyway so removed it
Diffstat (limited to 'lib/sqlalchemy/engine/url.py')
| -rw-r--r-- | lib/sqlalchemy/engine/url.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py index 679e4af89..044d701ac 100644 --- a/lib/sqlalchemy/engine/url.py +++ b/lib/sqlalchemy/engine/url.py @@ -103,15 +103,7 @@ class URL(object): used as the keys by default. Unset or false attributes are omitted from the final dictionary. - :param \**kw: Optional, alternate key names for url attributes: - - .. sourcecode:: python - - # return 'username' as 'user' - username='user' - - # omit 'database' - database=None + :param \**kw: Optional, alternate key names for url attributes. :param names: Deprecated. Same purpose as the keyword-based alternate names, but correlates the name to the original positionally. @@ -136,8 +128,8 @@ def make_url(name_or_url): The given string is parsed according to the RFC 1738 spec. If an existing URL object is passed, just returns the object. + """ - if isinstance(name_or_url, basestring): return _parse_rfc1738_args(name_or_url) else: |
