Skip to content

Commit 9c9e3bf

Browse files
committed
Remove compatibility for Python < 3.9
1 parent 529e449 commit 9c9e3bf

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

tests/django_restframework_gis_tests/migrations/0001_initial.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# -*- coding: utf-8 -*-
21
# Generated by Django 1.9.4 on 2016-04-01 17:00
3-
from __future__ import unicode_literals
42

53
import django.contrib.gis.db.models.fields
64
from django.db import migrations, models

tests/django_restframework_gis_tests/tests.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,7 @@ def test_geojson_format(self):
285285
'geometry': {'type': 'Point', 'coordinates': [135.0, 45.0]},
286286
}
287287
response = self.client.get(url)
288-
if sys.version_info > (3, 0, 0):
289-
self.assertCountEqual(json.dumps(response.data), json.dumps(expected))
290-
else:
291-
self.assertItemsEqual(json.dumps(response.data), json.dumps(expected))
288+
self.assertCountEqual(json.dumps(response.data), json.dumps(expected))
292289
response = self.client.get(url, headers={"accept": 'text/html'})
293290
self.assertContains(response, "Kool geojson test")
294291

@@ -550,10 +547,6 @@ def test_geojson_HTML_widget_value_pre_drf_39(self):
550547
self.assertContains(response, '<textarea name="geometry"')
551548
self.assertContains(response, '&quot;type&quot;: &quot;Point&quot;')
552549
self.assertContains(response, '&quot;coordinates&quot;: [')
553-
# TODO: remove this when python 2 will be deprecated
554-
self.assertNotContains(
555-
response, 'u&#39;type&#39;: u&#39;Point&#39;, u&#39;coordinates&#39;:'
556-
)
557550

558551
def test_patch_geojson_location(self):
559552
location = Location.objects.create(
@@ -769,8 +762,5 @@ def test_geometrycollection_geojson(self):
769762
},
770763
}
771764
response = self.client.get(url)
772-
if sys.version_info > (3, 0, 0):
773-
self.assertCountEqual(json.dumps(response.data), json.dumps(expected))
774-
else:
775-
self.assertItemsEqual(json.dumps(response.data), json.dumps(expected))
765+
self.assertCountEqual(json.dumps(response.data), json.dumps(expected))
776766
self.assertContains(response, "Kool geometry collection geojson test")

0 commit comments

Comments
 (0)