diff options
| author | Nick Pope <nick.pope@flightdataservices.com> | 2017-12-11 12:08:45 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-12-11 07:08:45 -0500 |
| commit | d13a9e44ded4e93570c6ba42ec84e45ddca2505b (patch) | |
| tree | 0df16e6538d8794c39bd62b5a46879b8abe6572c /django/db/backends/mysql/base.py | |
| parent | a9e5ac823df8ba8b786b6450c967ca378c008d0e (diff) | |
| download | django-d13a9e44ded4e93570c6ba42ec84e45ddca2505b.tar.gz | |
Fixed #28909 -- Simplified code using tuple/list/set/dict unpacking.
Diffstat (limited to 'django/db/backends/mysql/base.py')
| -rw-r--r-- | django/db/backends/mysql/base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 6b82afc45d..6612e10979 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -39,10 +39,10 @@ if version < (1, 3, 3): # MySQLdb returns TIME columns as timedelta -- they are more like timedelta in # terms of actual behavior as they are signed and include days -- and Django # expects time. -django_conversions = conversions.copy() -django_conversions.update({ - FIELD_TYPE.TIME: backend_utils.typecast_time, -}) +django_conversions = { + **conversions, + **{FIELD_TYPE.TIME: backend_utils.typecast_time}, +} # This should match the numerical portion of the version numbers (we can treat # versions like 5.0.24 and 5.0.24a as the same). |