summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-06-30 18:02:01 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-06-30 18:02:01 +0000
commit763e087de19d37d93172442bc6f29fe1e0e7a430 (patch)
treee310dbcf920b81f4c9a5c771171835c820978092
parent3d8ebb3bec77948d3b7ca1a58160d897ed8dbc46 (diff)
[multi-db] Cleaned up settings access in ConnectionInfo.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/__init__.py b/django/db/__init__.py
index ed0b8a4fb9..ac27248824 100644
--- a/django/db/__init__.py
+++ b/django/db/__init__.py
@@ -56,8 +56,8 @@ class ConnectionInfo(object):
def __repr__(self):
return "Connection: %r (ENGINE=%s NAME=%s)" \
% (self.connection,
- self.connection.settings.DATABASE_ENGINE,
- self.connection.settings.DATABASE_NAME)
+ self.settings.DATABASE_ENGINE,
+ self.settings.DATABASE_NAME)
def close(self):
"""Close connection"""
@@ -118,7 +118,7 @@ class LazyConnectionManager(object):
except AttributeError:
raise ImproperlyConfigured, \
"No DATABASES in settings."
-
+
# In settings it's a dict, but connect() needs an object
# pass global settings so that the default connection settings
# can be defaults for the named connections