Skip to content

Commit 01039b4

Browse files
arthansonarthanson
committed
ruff cleanup
1 parent 103dad3 commit 01039b4

File tree

5 files changed

+14
-28
lines changed

5 files changed

+14
-28
lines changed

‎cities/management/commands/cities.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
from urllib import urlopen
3232

3333
from itertools import chain
34-
from optparse import make_option
3534

36-
from django import VERSION as django_version
3735
from django.contrib.gis.gdal.envelope import Envelope
3836
from django.contrib.gis.geos import Point
3937
from django.contrib.gis.measure import D
@@ -244,7 +242,7 @@ def import_country(self):
244242
# continents as ForeignKeys to the Continent models, otherwise assume
245243
# they are still the CharField(max_length=2) and import them the old way
246244
import_continents_as_fks = (
247-
type(Country._meta.get_field("continent")) == ForeignKey
245+
type(Country._meta.get_field("continent")) is ForeignKey
248246
)
249247

250248
for item in tqdm(
@@ -293,7 +291,7 @@ def import_country(self):
293291
defaults["language_codes"] = item["languages"]
294292
elif (
295293
hasattr(Country, "languages")
296-
and type(getattr(Country, "languages")) == CharField
294+
and type(getattr(Country, "languages")) is CharField
297295
):
298296
defaults["languages"] = item["languages"]
299297

@@ -752,13 +750,11 @@ def import_district(self):
752750
D(km=1000),
753751
)
754752
)
755-
.annotate(
756-
distance=Distance("location", defaults["location"])
757-
)
753+
.annotate(distance=Distance("location", defaults["location"]))
758754
.order_by("distance")
759755
.first()
760756
)
761-
except City.DoesNotExist as e:
757+
except City.DoesNotExist:
762758
self.logger.warning(
763759
"District: %s: DB backend does not support native '.distance(...)' query "
764760
"falling back to two degree search",
@@ -1155,24 +1151,24 @@ def import_postal_code(self):
11551151
for args_dict in postal_code_args:
11561152
num_pcs = PostalCode.objects.filter(
11571153
*args_dict["args"],
1158-
**{k: v for k, v in args_dict.items() if k != "args"}
1154+
**{k: v for k, v in args_dict.items() if k != "args"},
11591155
).count()
11601156
if num_pcs == 1:
11611157
pc = PostalCode.objects.get(
11621158
*args_dict["args"],
1163-
**{k: v for k, v in args_dict.items() if k != "args"}
1159+
**{k: v for k, v in args_dict.items() if k != "args"},
11641160
)
11651161
break
11661162
elif num_pcs > 1:
11671163
pcs = PostalCode.objects.filter(
11681164
*args_dict["args"],
1169-
**{k: v for k, v in args_dict.items() if k != "args"}
1165+
**{k: v for k, v in args_dict.items() if k != "args"},
11701166
)
11711167
self.logger.debug("item: {}\nresults: {}".format(item, pcs))
11721168
# Raise a MultipleObjectsReturned exception
11731169
PostalCode.objects.get(
11741170
*args_dict["args"],
1175-
**{k: v for k, v in args_dict.items() if k != "args"}
1171+
**{k: v for k, v in args_dict.items() if k != "args"},
11761172
)
11771173
else:
11781174
self.logger.debug("Creating postal code: {}".format(item))

‎cities/models.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
from random import choice
22
from string import ascii_uppercase, digits
33

4-
from .conf import ALTERNATIVE_NAME_TYPES, DJANGO_VERSION, SLUGIFY_FUNCTION
5-
64
import swapper
75
from django.contrib.gis.db.models import PointField
86
from django.contrib.gis.geos import Point
@@ -11,6 +9,7 @@
119
from django.utils.encoding import force_str as force_text
1210
from model_utils import Choices
1311

12+
from .conf import ALTERNATIVE_NAME_TYPES, SLUGIFY_FUNCTION
1413
from .managers import AlternativeNameManager
1514
from .util import unicode_func
1615

‎cities/util.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
from math import acos, cos, radians, sin
55

66
import six
7-
from django import VERSION as DJANGO_VERSION
8-
97
from django.utils.encoding import force_str as force_text
108
from django.utils.functional import keep_lazy
119
from django.utils.safestring import SafeText, mark_safe
@@ -75,7 +73,6 @@ def default_slugify(obj, value):
7573
return mark_safe(value)
7674

7775

78-
7976
default_slugify = keep_lazy(six.text_type, SafeText)(default_slugify)
8077

8178

‎example/urls.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
from django import VERSION as DJANGO_VERSION
2-
3-
try:
4-
from django.conf.urls import url
5-
except ImportError:
6-
from django.urls import re_path as url
7-
81
from django.conf.urls import include
92
from django.contrib import admin
3+
from django.urls import re_path as url
104
from django.views.generic import ListView
115

126
from cities.models import City, Country, District, PostalCode, Region

‎test_project/test_app/tests/test_manage_command.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def setUpTestData(cls):
4747
force=True,
4848
**{
4949
"import": "country,region,subregion,city,district",
50-
}
50+
},
5151
)
5252
cls.counts = {
5353
"countries": Country.objects.count(),
@@ -91,7 +91,7 @@ def setUpTestData(cls):
9191
force=True,
9292
**{
9393
"import": "country,region,subregion,city,district,alt_name,postal_code",
94-
}
94+
},
9595
)
9696
cls.counts = {
9797
"countries": Country.objects.count(),
@@ -115,7 +115,7 @@ def test_idempotence(self):
115115
force=True,
116116
**{
117117
"import": "country,region,subregion,city,alt_name,postal_code",
118-
}
118+
},
119119
)
120120
self.assertEqual(Country.objects.count(), self.counts["countries"])
121121
self.assertEqual(Region.objects.count(), self.counts["regions"])
@@ -161,7 +161,7 @@ def setUpTestData(cls):
161161
force=True,
162162
**{
163163
"import": "country,region,subregion,city,district,alt_name",
164-
}
164+
},
165165
)
166166
cls.counts = {
167167
"countries": Country.objects.count(),

0 commit comments

Comments
 (0)