summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2006-02-27 23:45:17 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2006-02-27 23:45:17 +0000
commitf15a983d88328f87b35390b827e3a747c6bf181b (patch)
tree2f8c61acea08bd85ebec9a776095dd752da3aa81
parentda310cff674aa3d91f7e54772faf828a46071812 (diff)
Fixed #1336 -- made USStateField work correctly when data is None (thanks, chrisb)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/formfields.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/core/formfields.py b/django/core/formfields.py
index 3289be5235..167439cc07 100644
--- a/django/core/formfields.py
+++ b/django/core/formfields.py
@@ -875,7 +875,10 @@ class USStateField(TextField):
raise validators.CriticalValidationError, e.messages
def html2python(data):
- return data.upper() # Should always be stored in upper case
+ if data:
+ return data.upper() # Should always be stored in upper case
+ else:
+ return None
html2python = staticmethod(html2python)
class CommaSeparatedIntegerField(TextField):