From 7462e79d515078f8034dd51b2b05dd208d9fa691 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 30 Apr 2012 14:33:12 -0400
Subject: [PATCH] new style

---
 README.rst         |  2 +-
 dj_database_url.py | 19 ++++++++-----------
 setup.py           |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/README.rst b/README.rst
index 325a3e7..09be575 100644
--- a/README.rst
+++ b/README.rst
@@ -11,7 +11,7 @@ Usage
 
 Configure your database in ``settings.py``::
 
-    DATABASES = dj_database_url.config(DATABASES)
+    DATABASES['default'] = dj_database_url.config()
 
 Nice and simple.
 
diff --git a/dj_database_url.py b/dj_database_url.py
index b2eeee1..44f68b8 100644
--- a/dj_database_url.py
+++ b/dj_database_url.py
@@ -7,21 +7,18 @@ import urlparse
 urlparse.uses_netloc.append('postgres')
 urlparse.uses_netloc.append('mysql')
 
+DEFAULT_ENV = 'DATABASE_URL'
 
-def config(config=None):
+def config(env=DEFAULT_ENV):
     """Returns configured DATABASES dictionary."""
 
-    if config is None:
-        config = {}
+    config = {}
 
-    if 'DATABASE_URL' in os.environ:
-        url = urlparse.urlparse(os.environ['DATABASE_URL'])
-
-        # Ensure default database exists.
-        config.setdefault('default', {})
+    if env in os.environ:
+        url = urlparse.urlparse(os.environ[env])
 
         # Update with environment configuration.
-        config['default'].update({
+        config.update({
             'NAME': url.path[1:],
             'USER': url.username,
             'PASSWORD': url.password,
@@ -30,9 +27,9 @@ def config(config=None):
         })
 
         if url.scheme == 'postgres':
-            config['default']['ENGINE'] = 'django.db.backends.postgresql_psycopg2'
+            config['ENGINE'] = 'django.db.backends.postgresql_psycopg2'
 
         if url.scheme == 'mysql':
-            config['default']['ENGINE'] = 'django.db.backends.mysql'
+            config['ENGINE'] = 'django.db.backends.mysql'
 
     return config
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 8f5a599..15f4a20 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ Usage
 
 Configure your database in ``settings.py``::
 
-    DATABASES = dj_database_url.config(DATABASES)
+    DATABASES['default'] = dj_database_url.config()
 
 Nice and simple.
 
@@ -23,7 +23,7 @@ from setuptools import setup
 
 setup(
     name='dj-database-url',
-    version='0.1.0',
+    version='0.1.1',
     url='https://github.com/kennethreitz/dj-database-url',
     license='BSD',
     author='Kenneth Reitz',