From d5de7feecf949903c65c9ce9ba2729e5f6013459 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Fri, 25 Feb 2011 15:06:31 -0800
Subject: [PATCH] a few tweaks for resetting

---
 auth/jsonfield.py | 2 +-
 reset.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/auth/jsonfield.py b/auth/jsonfield.py
index ed99b57..808d031 100644
--- a/auth/jsonfield.py
+++ b/auth/jsonfield.py
@@ -43,7 +43,7 @@ class JSONField(models.TextField):
         try:
             parsed_value = json.loads(value)
         except:
-            import pdb; pdb.set_trace()
+            raise Exception("not JSON")
 
         if self.json_type and parsed_value:
             parsed_value = self.json_type.fromJSONDict(parsed_value, **self.deserialization_params)
diff --git a/reset.sh b/reset.sh
index 685d4b6..46de573 100755
--- a/reset.sh
+++ b/reset.sh
@@ -3,4 +3,4 @@ dropdb helios
 createdb helios
 python manage.py syncdb
 python manage.py migrate
-echo "from auth.models import User; User.update_or_create(user_type='google',user_id='ben@adida.net',info={})" | python manage.py shell
\ No newline at end of file
+echo "from auth.models import User; User.objects.create(user_type='google',user_id='ben@adida.net', info={})" | python manage.py shell
\ No newline at end of file
-- 
GitLab