# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1279019517 -19800
# Node ID 15c9e537187d22a27f1c3a02463a572806d760c0
# Parent  06b7e950a798bddc672310d979353676f4217a43
Database name changes and import json change.

diff -r 06b7e950a798 -r 15c9e537187d project/kiwipycon/proceedings/views.py
--- a/project/kiwipycon/proceedings/views.py	Tue Jul 13 16:32:29 2010 +0530
+++ b/project/kiwipycon/proceedings/views.py	Tue Jul 13 16:41:57 2010 +0530
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import json
+import simplejson as json
 
 from django.contrib.auth import login
 from django.contrib.auth.decorators import login_required
@@ -110,4 +110,4 @@
         'suggestions':[user.username for user in suggestions],
         }
 
-    return HttpResponse(json.dumps(suggest_data))
\ No newline at end of file
+    return HttpResponse(json.dumps(suggest_data))
diff -r 06b7e950a798 -r 15c9e537187d project/production.py
--- a/project/production.py	Tue Jul 13 16:32:29 2010 +0530
+++ b/project/production.py	Tue Jul 13 16:41:57 2010 +0530
@@ -30,6 +30,6 @@
 
 DATABASE_ENGINE = 'mysql'
 DATABASE_NAME = 'conference2009'
-DATABASE_USER = 'root'
+DATABASE_USER = 'scipy'
 # Imports DATABASE_PASSWORD from project/local.py that is not part of mercurial repo
 from project.local import DATABASE_PASSWORD