From e15c4832f58cb95cd7865e69868cc97278084586 Mon Sep 17 00:00:00 2001
From: Robert Wittams <robert@wittams.com>
Date: Fri, 14 Oct 2005 20:00:17 +0000
Subject: [PATCH]  Fix for null values in foreign keys. Thanks Andreas.

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/core/meta/fields.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/django/core/meta/fields.py b/django/core/meta/fields.py
index 05d00a13c7..f555e3be93 100644
--- a/django/core/meta/fields.py
+++ b/django/core/meta/fields.py
@@ -656,13 +656,10 @@ class ForeignKey(Field):
             return [formfields.IntegerField]
 
     def get_db_prep_save(self,value):
-       try:
-            if value == '' or None:
-                return None
-            else:
-                return int(value)
-       except Exception, e: 
-            print "name: %s  val: %s" % (self.name, value)         
+        if value == '' or value == None:
+           return None
+        else:
+           return int(value)
 
     def flatten_data(self, obj = None):
         if not obj: 
@@ -949,4 +946,4 @@ class Admin:
             new_fieldset_list.append(FieldSet(name, classes, opts.get_field, line_specs) )
         return new_fieldset_list
     
-    
\ No newline at end of file
+