Run pyupgrade to modernize code - DATA-4232

spillway/carto.py

@@ -46,7 +46,7 @@ def build_map(querysets, tileform):
     return m
 
 
-class Map(object):
+class Map:
     mapfile = default_storage.path("map.xml")
 
     def __init__(self, width=256, height=256):
@@ -97,7 +97,7 @@ def zoom_bbox(self, bbox):
             self.map.zoom_to_box(mapnik.Box2d(*bbox.extent))
 
 
-class Layer(object):
+class Layer:
     """Base class for a Mapnik layer."""
 
     def __getattr__(self, attr):

spillway/collections.py

@@ -16,13 +16,13 @@ def as_feature(data):
             data = Feature(**data)
         elif has_features(data):
             data = FeatureCollection(**data)
-        elif isinstance(data, collections.Sequence):
+        elif isinstance(data, collections.abc.Sequence):
             data = FeatureCollection(features=data)
         elif has_layer(data):
             data = LayerCollection(data)
         elif has_coordinates(data):
             data = Feature(geometry=data)
-        elif isinstance(data, collections.Mapping) and not data:
+        elif isinstance(data, collections.abc.Mapping) and not data:
             data = Feature()
     return data
 
@@ -136,7 +136,7 @@ def geojson(self):
         geom = self["geometry"] or "{}"
         keys = self.keys() - {"geometry"}
         props = json.dumps({k: self[k] for k in keys}, cls=JSONEncoder)[1:-1]
-        return '{"geometry": %s, %s}' % (str(geom), props)
+        return '{{"geometry": {}, {}}}'.format(str(geom), props)
 
 
 class FeatureCollection(AbstractFeature):
@@ -182,5 +182,5 @@ def __init__(self, iterable=(), **kwargs):
 
     @property
     def geojson(self):
-        layers = ",".join(['"%s": %s' % (k, v.geojson) for k, v in self.items()])
+        layers = ",".join(['"{}": {}'.format(k, v.geojson) for k, v in self.items()])
         return "{%s}" % layers

spillway/compat.py

@@ -18,7 +18,7 @@ class JSONEncoder(json.JSONEncoder):
     import mapnik
 except ImportError:
 
-    class Mapnik(object):
+    class Mapnik:
         def __getattr__(self, attr):
             raise ImproperlyConfigured("Mapnik must be installed")
 

spillway/fields.py

@@ -41,7 +41,7 @@ def get_attribute(self, instance):
 
     def to_internal_value(self, data):
         # forms.GeometryField cannot handle geojson dicts.
-        if isinstance(data, collections.Mapping):
+        if isinstance(data, collections.abc.Mapping):
             data = json.dumps(data)
         field = fields.GeometryField(widget=forms.BaseGeometryWidget())
         return field.to_python(data)

spillway/forms/fields.py

@@ -159,7 +159,7 @@ def to_python(self, value):
         sref = None
         # Work with a single GeoJSON geometry or a Feature.
         value = json.loads(value) if '"Feature"' in value else value
-        if isinstance(value, collections.Mapping):
+        if isinstance(value, collections.abc.Mapping):
             feat = sc.as_feature(value)
             value = json.dumps(feat.get("geometry") or value)
             sref = feat.srs

spillway/forms/forms.py

@@ -12,7 +12,7 @@ class QuerySetForm(forms.Form):
     """Base form for applying GeoQuerySet methods and filters."""
 
     def __init__(self, data=None, queryset=None, *args, **kwargs):
-        super(QuerySetForm, self).__init__(data, *args, **kwargs)
+        super().__init__(data, *args, **kwargs)
         self.queryset = queryset
         self._is_selected = False
 
@@ -57,7 +57,7 @@ class SpatialQueryForm(QuerySetForm):
     bbox = fields.BoundingBoxField(required=False)
 
     def __init__(self, *args, **kwargs):
-        super(SpatialQueryForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         lookups = GeometryField.get_lookups()
         for lookup in self.data:
             if lookup in lookups:
@@ -67,7 +67,7 @@ def __init__(self, *args, **kwargs):
                 break
 
     def clean(self):
-        cleaned_data = super(SpatialQueryForm, self).clean()
+        cleaned_data = super().clean()
         spatial_lookup = set(cleaned_data.keys()) - {"bbox"}
         bbox = cleaned_data.pop("bbox", None)
         # Look for "bbox" which is just an alias to "bboverlaps".
@@ -131,7 +131,7 @@ def clean(self):
         """Return cleaned fields as a dict, determine which geom takes
         precedence.
         """
-        data = super(RasterQueryForm, self).clean()
+        data = super().clean()
         geom = data.pop("upload", None) or data.pop("bbox", None)
         if geom:
             data["g"] = geom
@@ -170,7 +170,7 @@ class TileForm(QuerySetForm):
     z = forms.IntegerField()
 
     def clean(self):
-        data = super(TileForm, self).clean()
+        data = super().clean()
         x, y, z = map(data.get, ("x", "y", "z"))
         # Create bbox from NW and SE tile corners.
         try:

spillway/mixins.py

@@ -3,7 +3,7 @@
 from rest_framework.settings import api_settings
 
 
-class ModelSerializerMixin(object):
+class ModelSerializerMixin:
     """Provides generic model serializer classes to views."""
 
     model_serializer_class = None
@@ -20,7 +20,7 @@ class Meta:
         return DefaultSerializer
 
 
-class ResponseExceptionMixin(object):
+class ResponseExceptionMixin:
     """Handle response exceptions by negotating among default renderers.
 
     The default exception handler passes error message dicts to the renderer

spillway/models.py

@@ -17,7 +17,7 @@
 # Workaround for migrations and FileField upload_to, see:
 # https://code.djangoproject.com/ticket/22999
 @deconstructible
-class UploadDir(object):
+class UploadDir:
     def __init__(self, path):
         self.path = path
 

spillway/query.py

@@ -20,7 +20,7 @@ def filter_geometry(queryset, **filters):
     usual "geometryfield__lookuptype" format.
     """
     fieldname = geo_field(queryset).name
-    query = {"%s__%s" % (fieldname, k): v for k, v in filters.items()}
+    query = {"{}__{}".format(fieldname, k): v for k, v in filters.items()}
     return queryset.filter(**query)
 
 

spillway/renderers/gdal.py

@@ -76,7 +76,7 @@ class GeoTIFFZipRenderer(BaseGDALRenderer):
     def render(self, data, accepted_media_type=None, renderer_context=None):
         if len(data) > 1:
             raise ValueError("Expected one-length sequence")
-        return super(GeoTIFFZipRenderer, self).render(
+        return super().render(
             data[0], accepted_media_type, renderer_context
         )
 

spillway/renderers/renderers.py

@@ -22,7 +22,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
         try:
             return data.geojson
         except AttributeError:
-            return super(GeoJSONRenderer, self).render(
+            return super().render(
                 data, accepted_media_type, renderer_context
             )
 
@@ -57,7 +57,7 @@ class KMZRenderer(KMLRenderer):
     format = "kmz"
 
     def render(self, *args, **kwargs):
-        kmldata = super(KMZRenderer, self).render(*args, **kwargs)
+        kmldata = super().render(*args, **kwargs)
         return compress_kml(kmldata)
 
 

spillway/urls.py

@@ -5,7 +5,7 @@
 # Regex for an optional file extension.
 format_suffix = r"(?:\.(?P<format>[\w.]+))?"
 # Regex groups for a tile URL in {z}/{x}/{y}.{format} order.
-tile = ("(?P<z>\d+)", "(?P<x>\d+)", "(?P<y>\d+)%s/?$" % format_suffix)
+tile = (r"(?P<z>\d+)", r"(?P<x>\d+)", r"(?P<y>\d+)%s/?$" % format_suffix)
 tileregex = sep.join(tile)
 
 

spillway/validators.py

@@ -4,7 +4,7 @@
 
 
 @deconstructible
-class GeometrySizeValidator(object):
+class GeometrySizeValidator:
     """Field validator to limit geometries to a given area."""
 
     message = _("Max area exceeded.")

tests/models.py

@@ -22,7 +22,7 @@ class Meta:
         ordering = ["id"]
 
     def __repr__(self):
-        return "<%s: %s %s>" % (self.__class__.__name__, self.name, self.geom)
+        return "<{}: {} {}>".format(self.__class__.__name__, self.name, self.geom)
 
     def __str__(self):
         return self.name

tests/test_generics.py

@@ -219,16 +219,16 @@ def test_paginate_geojson(self):
 class RasterListViewTestCase(RasterStoreTestBase):
     def test_list_apidoc(self):
         response = self.client.get("/rasters/", {"format": "api"})
-        self.assertRegexpMatches(
-            response.content.decode("utf-8"), "image.+?http://.*\.tif"
+        self.assertRegex(
+            response.content.decode("utf-8"), r"image.+?http://.*\.tif"
         )
         point = self.object.geom.centroid
         response = self.client.get("/rasters/", {"format": "api", "g": point.wkt})
         self.assertEqual(response.data[0]["image"], 12)
 
     def test_list_json(self):
         d = self.client.get("/rasters/").json()
-        self.assertRegexpMatches(d[0]["image"], "^http://.*\.tif$")
+        self.assertRegex(d[0]["image"], r"^http://.*\.tif$")
 
     def test_list_json_array(self):
         with Raster(self.object.image.path) as r:

tests/test_renderers.py

@@ -98,15 +98,15 @@ def assert_member_formats(self, rend, geom=None):
         ext = rend.format
         if rend.format.endswith(".zip"):
             ext = os.path.splitext(rend.format)[0]
-        pat = "tmin_.+(?<!\.{0})\.{0}$".format(ext)
+        pat = r"tmin_.+(?<!\.{0})\.{0}$".format(ext)
         driver = driver_for_path(ext, ImageDriver.filter_copyable())
         qs = self.qs.warp(format=driver.ext, geom=geom)
         lst = [obj.raster() for obj in qs]
         rs = RasterStoreSerializer(qs.zipfiles(), many=True)
         fp = rend.render(rs.data)
         with zipfile.ZipFile(fp) as zf:
             for r, name in zip(lst, zf.namelist()):
-                self.assertRegexpMatches(name, pat)
+                self.assertRegex(name, pat)
                 imgdata = zf.read(name)
                 self.assert_format(imgdata, driver.format)
                 memio = MemFileIO()

tests/test_serializers.py

@@ -15,7 +15,7 @@
 from .test_models import RasterStoreTestBase
 
 
-class RequestMock(object):
+class RequestMock:
     def __init__(self):
         self.accepted_renderer = renderers.JSONRenderer()
         self.GET = {}
@@ -112,7 +112,7 @@ def test_serialize_object(self):
 
 class FeatureSerializerTestCase(ModelTestCase):
     def setUp(self):
-        super(FeatureSerializerTestCase, self).setUp()
+        super().setUp()
         attrs = {
             "id": 1,
             "crs": 4326,
@@ -197,7 +197,7 @@ def test_deserialize_list(self):
 
 class RasterSerializerTestCase(RasterStoreTestBase):
     def setUp(self):
-        super(RasterSerializerTestCase, self).setUp()
+        super().setUp()
         self.request = RequestMock()
         self.ctx = {"request": self.request}
 

tests/urls.py

@@ -19,7 +19,7 @@
         name="location-tiles",
     ),
     url(
-        tilepath("^maptiles/(?P<pk>\d+)/"),
+        tilepath(r"^maptiles/(?P<pk>\d+)/"),
         views.RasterTileView.as_view(queryset=RasterStore.objects.all()),
         name="map-tiles",
     ),