summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/url.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-05-09 16:34:10 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-05-09 16:34:10 +0000
commit4a6afd469fad170868554bf28578849bf3dfd5dd (patch)
treeb396edc33d567ae19dd244e87137296450467725 /lib/sqlalchemy/engine/url.py
parent46b7c9dc57a38d5b9e44a4723dad2ad8ec57baca (diff)
downloadsqlalchemy-4a6afd469fad170868554bf28578849bf3dfd5dd.tar.gz
r4695 merged to trunk; trunk now becomes 0.5.
0.4 development continues at /sqlalchemy/branches/rel_0_4
Diffstat (limited to 'lib/sqlalchemy/engine/url.py')
-rw-r--r--lib/sqlalchemy/engine/url.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index 7364f0227..72d09bf85 100644
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -7,7 +7,7 @@ be used directly and is also accepted directly by ``create_engine()``.
"""
import re, cgi, sys, urllib
-from sqlalchemy import exceptions
+from sqlalchemy import exc
class URL(object):
@@ -53,7 +53,7 @@ class URL(object):
self.port = int(port)
else:
self.port = None
- self.database= database
+ self.database = database
self.query = query or {}
def __str__(self):
@@ -180,7 +180,7 @@ def _parse_rfc1738_args(name):
name = components.pop('name')
return URL(name, **components)
else:
- raise exceptions.ArgumentError(
+ raise exc.ArgumentError(
"Could not parse rfc1738 URL from string '%s'" % name)
def _parse_keyvalue_args(name):