diff options
| author | Дилян Палаузов <dilyanpalauzov@users.noreply.github.com> | 2017-11-06 10:23:29 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-11-07 09:08:46 -0500 |
| commit | c69e4bc69166b2d752b437a651dfa91f8b53ecfd (patch) | |
| tree | 49cb2c1b54962eff1a02636062b213397003e7ed /django/contrib | |
| parent | 00b93c2b1ecdda978f067309c6feafda633a7264 (diff) | |
Fixed #28769 -- Replaced 'x if x else y' with 'x or y'.
Diffstat (limited to 'django/contrib')
| -rw-r--r-- | django/contrib/admin/bin/compress.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/gdal/raster/base.py | 2 | ||||
| -rw-r--r-- | django/contrib/sessions/backends/file.py | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/django/contrib/admin/bin/compress.py b/django/contrib/admin/bin/compress.py index 06e750f3cb..69660284eb 100644 --- a/django/contrib/admin/bin/compress.py +++ b/django/contrib/admin/bin/compress.py @@ -28,7 +28,7 @@ Compiler library and Java version 6 or later.""" parser.add_argument("-q", "--quiet", action="store_false", dest="verbose") options = parser.parse_args() - compiler = Path(closure_compiler if closure_compiler else options.compiler).expanduser() + compiler = Path(closure_compiler or options.compiler).expanduser() if not compiler.exists(): sys.exit( "Google Closure compiler jar file %s not found. Please use the -c " diff --git a/django/contrib/gis/gdal/raster/base.py b/django/contrib/gis/gdal/raster/base.py index c98f636ec2..5bf3fb804e 100644 --- a/django/contrib/gis/gdal/raster/base.py +++ b/django/contrib/gis/gdal/raster/base.py @@ -56,7 +56,7 @@ class GDALRasterBase(GDALBase): counter += 1 item = data[counter] # The default domain values are returned if domain is None. - result[domain if domain else 'DEFAULT'] = domain_meta + result[domain or 'DEFAULT'] = domain_meta return result @metadata.setter diff --git a/django/contrib/sessions/backends/file.py b/django/contrib/sessions/backends/file.py index 0a724f7e0a..0c09fa564c 100644 --- a/django/contrib/sessions/backends/file.py +++ b/django/contrib/sessions/backends/file.py @@ -73,10 +73,9 @@ class SessionStore(SessionBase): """ Return the expiry time of the file storing the session's content. """ - expiry = session_data.get('_session_expiry') - if not expiry: - expiry = self._last_modification() + datetime.timedelta(seconds=settings.SESSION_COOKIE_AGE) - return expiry + return session_data.get('_session_expiry') or ( + self._last_modification() + datetime.timedelta(seconds=settings.SESSION_COOKIE_AGE) + ) def load(self): session_data = {} |
