From c68f66e0144b69367e98692cba313251a36b85a8 Mon Sep 17 00:00:00 2001 From: Nick Pope Date: Thu, 7 Dec 2017 14:10:32 +0000 Subject: [PATCH] Refs #23919 -- Replaced super() calls for old-style classes. --- django/contrib/gis/gdal/raster/band.py | 2 +- django/contrib/gis/gdal/raster/source.py | 2 +- django/core/cache/backends/db.py | 2 +- django/core/cache/backends/dummy.py | 2 +- django/core/cache/backends/locmem.py | 2 +- django/core/management/commands/loaddata.py | 2 +- django/core/serializers/xml_serializer.py | 2 +- django/test/html.py | 2 +- django/utils/html.py | 2 +- django/utils/log.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/django/contrib/gis/gdal/raster/band.py b/django/contrib/gis/gdal/raster/band.py index d78fd2213e..7c7f7dc903 100644 --- a/django/contrib/gis/gdal/raster/band.py +++ b/django/contrib/gis/gdal/raster/band.py @@ -242,7 +242,7 @@ class GDALBand(GDALRasterBase): class BandList(list): def __init__(self, source): self.source = source - list.__init__(self) + super().__init__() def __iter__(self): for idx in range(1, len(self) + 1): diff --git a/django/contrib/gis/gdal/raster/source.py b/django/contrib/gis/gdal/raster/source.py index 8c35b45cb5..fc02bce960 100644 --- a/django/contrib/gis/gdal/raster/source.py +++ b/django/contrib/gis/gdal/raster/source.py @@ -31,7 +31,7 @@ class TransformPoint(list): def __init__(self, raster, prop): x = raster.geotransform[self.indices[prop][0]] y = raster.geotransform[self.indices[prop][1]] - list.__init__(self, [x, y]) + super().__init__([x, y]) self._raster = raster self._prop = prop diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py index 576d711a67..3a3dd0bbab 100644 --- a/django/core/cache/backends/db.py +++ b/django/core/cache/backends/db.py @@ -31,7 +31,7 @@ class Options: class BaseDatabaseCache(BaseCache): def __init__(self, table, params): - BaseCache.__init__(self, params) + super().__init__(params) self._table = table class CacheEntry: diff --git a/django/core/cache/backends/dummy.py b/django/core/cache/backends/dummy.py index ab2b838ad4..4de2485be6 100644 --- a/django/core/cache/backends/dummy.py +++ b/django/core/cache/backends/dummy.py @@ -5,7 +5,7 @@ from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache class DummyCache(BaseCache): def __init__(self, host, *args, **kwargs): - BaseCache.__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) def add(self, key, value, timeout=DEFAULT_TIMEOUT, version=None): key = self.make_key(key, version=version) diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py index b2600d3169..9809880bf5 100644 --- a/django/core/cache/backends/locmem.py +++ b/django/core/cache/backends/locmem.py @@ -21,7 +21,7 @@ def dummy(): class LocMemCache(BaseCache): def __init__(self, name, params): - BaseCache.__init__(self, params) + super().__init__(params) self._cache = _caches.setdefault(name, {}) self._expire_info = _expire_info.setdefault(name, {}) self._lock = _locks.setdefault(name, RWLock()) diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py index bed6be14e4..da26c256ca 100644 --- a/django/core/management/commands/loaddata.py +++ b/django/core/management/commands/loaddata.py @@ -332,7 +332,7 @@ class Command(BaseCommand): class SingleZipReader(zipfile.ZipFile): def __init__(self, *args, **kwargs): - zipfile.ZipFile.__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) if len(self.namelist()) != 1: raise ValueError("Zip-compressed fixtures must contain one file.") diff --git a/django/core/serializers/xml_serializer.py b/django/core/serializers/xml_serializer.py index 1c57e8b660..076be1fe1f 100644 --- a/django/core/serializers/xml_serializer.py +++ b/django/core/serializers/xml_serializer.py @@ -308,7 +308,7 @@ class DefusedExpatParser(_ExpatParser): Forbid DTDs, external entity references """ def __init__(self, *args, **kwargs): - _ExpatParser.__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self.setFeature(handler.feature_external_ges, False) self.setFeature(handler.feature_external_pes, False) diff --git a/django/test/html.py b/django/test/html.py index b5ec00b16f..2c33731447 100644 --- a/django/test/html.py +++ b/django/test/html.py @@ -148,7 +148,7 @@ class Parser(HTMLParser): ) def __init__(self): - HTMLParser.__init__(self, convert_charrefs=False) + super().__init__(convert_charrefs=False) self.root = RootElement() self.open_tags = [] self.element_positions = {} diff --git a/django/utils/html.py b/django/utils/html.py index 4fefbc6355..9c219ba1c6 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -136,7 +136,7 @@ def linebreaks(value, autoescape=False): class MLStripper(HTMLParser): def __init__(self): - HTMLParser.__init__(self, convert_charrefs=False) + super().__init__(convert_charrefs=False) self.reset() self.fed = [] diff --git a/django/utils/log.py b/django/utils/log.py index 12b830a794..2c3d4ed5e3 100644 --- a/django/utils/log.py +++ b/django/utils/log.py @@ -82,7 +82,7 @@ class AdminEmailHandler(logging.Handler): """ def __init__(self, include_html=False, email_backend=None): - logging.Handler.__init__(self) + super().__init__() self.include_html = include_html self.email_backend = email_backend