mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/multidb] Corrected merge error. Patch from Russell Keith-Magee.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2009-12-15 08:25:50 +00:00
parent 4e25ca00c8
commit d5e883f2e3
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/fields/__init__.py
View File

@ -756,12 +756,8 @@ class IntegerField(Field):
"""Integer""" """Integer"""
empty_strings_allowed = False empty_strings_allowed = False
<<<<<<< HEAD:django/db/models/fields/__init__.py
def get_prep_value(self, value):
=======
def get_db_prep_value(self, value): def get_prep_value(self, value):
>>>>>>> master:django/db/models/fields/__init__.py
if value is None: if value is None:
return None return None
return int(value) return int(value)