Commit c309a882 authored by Kenneth Reitz's avatar Kenneth Reitz

python cleanups

parent 2a550b1a
......@@ -95,6 +95,7 @@ import sys
import urlparse
urlparse.uses_netloc.append('postgres')
urlparse.uses_netloc.append('mysql')
try:
# Check to make sure DATABASES is set in settings.py file.
......@@ -103,9 +104,12 @@ try:
if 'DATABASES' not in locals():
DATABASES = {}
if 'DATABASE_URL' os.environ:
if 'DATABASE_URL' in os.environ:
url = urlparse.urlparse(os.environ['DATABASE_URL'])
# Ensure default database exists.
DATABASES['default'] = DATABASES.get('default', {})
# We use update here to preserve other keys we
# don't care about (like OPTIONS)
DATABASES['default'].update({
......@@ -121,7 +125,7 @@ try:
if url.scheme == 'mysql':
DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
except:
print "Unexpected error:", sys.exc_info()
print 'Unexpected error:', sys.exc_info()
EOF
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment