diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-09-10 17:38:58 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-09-10 17:38:58 +0000 |
| commit | efb832744466548ea6f86fa027ffe702baa0d9a0 (patch) | |
| tree | ae06de05ef40aba04d1e6509025edb227a56a21d | |
| parent | eb297583b1b78403cda501133a52e71dd0381576 (diff) | |
Fixed #16808, removed some dead code from teh ORM. Thanks to aaugustin for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/backends/util.py | 8 | ||||
| -rw-r--r-- | tests/regressiontests/db_typecasts/tests.py | 12 |
2 files changed, 4 insertions, 16 deletions
diff --git a/django/db/backends/util.py b/django/db/backends/util.py index 0766f87787..9d2d379132 100644 --- a/django/db/backends/util.py +++ b/django/db/backends/util.py @@ -102,11 +102,6 @@ def typecast_timestamp(s): # does NOT store time zone information return datetime.datetime(int(dates[0]), int(dates[1]), int(dates[2]), int(times[0]), int(times[1]), int(seconds), int((microseconds + '000000')[:6])) -def typecast_boolean(s): - if s is None: return None - if not s: return False - return str(s)[0].lower() == 't' - def typecast_decimal(s): if s is None or s == '': return None @@ -116,9 +111,6 @@ def typecast_decimal(s): # Converters from Python to database (string) # ############################################### -def rev_typecast_boolean(obj, d): - return obj and '1' or '0' - def rev_typecast_decimal(d): if d is None: return None diff --git a/tests/regressiontests/db_typecasts/tests.py b/tests/regressiontests/db_typecasts/tests.py index 1d3bbfa101..cb5984f303 100644 --- a/tests/regressiontests/db_typecasts/tests.py +++ b/tests/regressiontests/db_typecasts/tests.py @@ -1,7 +1,10 @@ # Unit tests for typecast functions in django.db.backends.util +import datetime + from django.db.backends import util as typecasts -import datetime, unittest +from django.utils import unittest + TEST_CASES = { 'typecast_date': ( @@ -42,13 +45,6 @@ TEST_CASES = { ('2010-10-12 15:29:22.0632021', datetime.datetime(2010, 10, 12, 15, 29, 22, 63202)), ('2010-10-12 15:29:22.0632029', datetime.datetime(2010, 10, 12, 15, 29, 22, 63202)), ), - 'typecast_boolean': ( - (None, None), - ('', False), - ('t', True), - ('f', False), - ('x', False), - ), } class DBTypeCasts(unittest.TestCase): |