From dd5d559c5f6888ddc92a34e9aa9ee9f038d210b0 Mon Sep 17 00:00:00 2001 From: Davide Date: Wed, 2 Mar 2022 16:01:46 +0100 Subject: [PATCH] drop python2 code --- example/example/migrations/0001_initial.py | 2 -- osm_field/fields.py | 22 ++++++++++------------ osm_field/forms.py | 2 +- osm_field/widgets.py | 14 ++++++-------- tests/migrations/0001_initial.py | 2 -- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/example/example/migrations/0001_initial.py b/example/example/migrations/0001_initial.py index b913d76..220ee41 100644 --- a/example/example/migrations/0001_initial.py +++ b/example/example/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import osm_field.fields diff --git a/osm_field/fields.py b/osm_field/fields.py index c766f32..6521837 100644 --- a/osm_field/fields.py +++ b/osm_field/fields.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.core import checks from django.core.exceptions import FieldDoesNotExist from django.db.models.fields import FloatField, TextField @@ -11,7 +9,7 @@ from .widgets import OSMWidget -class Location(object): +class Location: """ A wrapper class bundling the description of a location (``text``) and its geo coordinates, latitude (``lat``) and longitude (``lon``). @@ -75,7 +73,7 @@ def __init__(self, *args, **kwargs): kwargs.setdefault("validators", []) if validate_latitude not in kwargs["validators"]: kwargs["validators"].append(validate_latitude) - super(LatitudeField, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def formfield(self, **kwargs): """ @@ -83,7 +81,7 @@ def formfield(self, **kwargs): ``min_value`` -90. """ kwargs.update({"max_value": 90, "min_value": -90}) - return super(LatitudeField, self).formfield(**kwargs) + return super().formfield(**kwargs) class LongitudeField(FloatField): @@ -100,7 +98,7 @@ def __init__(self, *args, **kwargs): kwargs.setdefault("validators", []) if validate_longitude not in kwargs["validators"]: kwargs["validators"].append(validate_longitude) - super(LongitudeField, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def formfield(self, **kwargs): """ @@ -108,7 +106,7 @@ def formfield(self, **kwargs): ``min_value`` -180. """ kwargs.update({"max_value": 180, "min_value": -180}) - return super(LongitudeField, self).formfield(**kwargs) + return super().formfield(**kwargs) class OSMField(TextField): @@ -127,7 +125,7 @@ def __init__(self, *args, **kwargs): self._lat_field_name = kwargs.pop("lat_field", None) self._lon_field_name = kwargs.pop("lon_field", None) self.data_field_name = kwargs.pop("data_field", None) - super(OSMField, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def contribute_to_class(self, cls, name): info_name = "get_%s_info" % name @@ -142,10 +140,10 @@ def _func(obj): setattr(cls, info_name, _func) - super(OSMField, self).contribute_to_class(cls, name) + super().contribute_to_class(cls, name) def check(self, **kwargs): - errors = super(OSMField, self).check(**kwargs) + errors = super().check(**kwargs) errors.extend(self._check_latitude_field()) errors.extend(self._check_longitude_field()) return errors @@ -185,7 +183,7 @@ def _check_longitude_field(self): return [] def deconstruct(self): - name, path, args, kwargs = super(OSMField, self).deconstruct() + name, path, args, kwargs = super().deconstruct() kwargs.update( { "lat_field": self.latitude_field_name, @@ -213,7 +211,7 @@ def formfield(self, **kwargs): } defaults.update(kwargs) - return super(OSMField, self).formfield(**defaults) + return super().formfield(**defaults) @property def latitude_field_name(self): diff --git a/osm_field/forms.py b/osm_field/forms.py index 1ce9d98..6ca0bff 100644 --- a/osm_field/forms.py +++ b/osm_field/forms.py @@ -10,7 +10,7 @@ def as_widget(self, widget=None, attrs=None, only_initial=False): attrs = {} if attrs is None else attrs.copy() if self.form.prefix: attrs.update({"prefix": self.form.prefix}) - return super(PrefixedBoundField, self).as_widget(widget, attrs, only_initial) + return super().as_widget(widget, attrs, only_initial) class PrefixedFormFieldMixin(object): diff --git a/osm_field/widgets.py b/osm_field/widgets.py index d3682ed..34edd4f 100644 --- a/osm_field/widgets.py +++ b/osm_field/widgets.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.forms.widgets import Media, TextInput from django.utils.html import format_html @@ -9,18 +7,18 @@ def _get_js(debug=False): base = ["js/vendor/leaflet.js"] if debug: - base.extend(["js/osm_field.js"]) + base.append("js/osm_field.js") else: - base.extend(["js/osm_field.min.js"]) + base.append("js/osm_field.min.js") return base def _get_css(debug=False): base = ["css/vendor/leaflet.css"] if debug: - base.extend(["css/osm_field.css"]) + base.append("css/osm_field.css") else: - base.extend(["css/osm_field.min.css"]) + base.append("css/osm_field.min.css") return base @@ -46,7 +44,7 @@ def __init__(self, lat_field, lon_field, data_field=None, attrs=None): attrs["class"] += " osmfield" else: attrs["class"] = "osmfield" - super(OSMWidget, self).__init__(attrs=attrs) + super().__init__(attrs=attrs) def render(self, name, value, attrs=None, renderer=None): attrs = {} if attrs is None else attrs.copy() @@ -69,7 +67,7 @@ def render(self, name, value, attrs=None, renderer=None): attrs["data-data-field"] = "{}-{}".format( prefix, attrs.get("data-data-field", self.attrs["data-data-field"]) ) - ret = super(OSMWidget, self).render(name, value, attrs=attrs) + ret = super().render(name, value, attrs=attrs) id_ = attrs["id"] ret += self.render_osmfield(id_) return ret diff --git a/tests/migrations/0001_initial.py b/tests/migrations/0001_initial.py index 063740b..5dc5971 100644 --- a/tests/migrations/0001_initial.py +++ b/tests/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import osm_field.fields