diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-07-01 12:02:17 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-07-01 12:02:17 +0200 |
| commit | d5589b4cd3238c4bf4063ddd8239d22b37caa7d3 (patch) | |
| tree | 34a10064e210d88a65ef1203a7c00af971a8e467 /django/db/backends/sqlite3 | |
| parent | a763915a03579868c6abdc5cdffbb4c398dc52ee (diff) | |
Removed some conditional code only needed under Python 2.6.
Diffstat (limited to 'django/db/backends/sqlite3')
| -rw-r--r-- | django/db/backends/sqlite3/base.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index 92dbf354ae..4345790b06 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -78,14 +78,8 @@ Database.register_converter(str("decimal"), decoder(util.typecast_decimal)) Database.register_adapter(datetime.datetime, adapt_datetime_with_timezone_support) Database.register_adapter(decimal.Decimal, util.rev_typecast_decimal) -if Database.version_info >= (2, 4, 1): - # Starting in 2.4.1, the str type is not accepted anymore, therefore, - # we convert all str objects to Unicode - # As registering a adapter for a primitive type causes a small - # slow-down, this adapter is only registered for sqlite3 versions - # needing it (Python 2.6 and up). - Database.register_adapter(str, lambda s: s.decode('utf-8')) - Database.register_adapter(SafeBytes, lambda s: s.decode('utf-8')) +Database.register_adapter(str, lambda s: s.decode('utf-8')) +Database.register_adapter(SafeBytes, lambda s: s.decode('utf-8')) class DatabaseFeatures(BaseDatabaseFeatures): # SQLite cannot handle us only partially reading from a cursor's result set |
