diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2017-11-23 00:25:32 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-11-23 08:52:23 -0500 |
| commit | 93cdd07e8fb08d7bb3f1e4a7117aa9d0d76581cd (patch) | |
| tree | 41edf2859576e556951376250cb7051bdd6f9221 /tests/gis_tests | |
| parent | 3f237c1a5b936a9b85304cffbf3343f491e395d6 (diff) | |
Used bytes.hex() and bytes.fromhex() to simplify.
Diffstat (limited to 'tests/gis_tests')
| -rw-r--r-- | tests/gis_tests/gdal_tests/test_geom.py | 3 | ||||
| -rw-r--r-- | tests/gis_tests/geos_tests/test_geos.py | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/gis_tests/gdal_tests/test_geom.py b/tests/gis_tests/gdal_tests/test_geom.py index c7a0872de8..d25627221d 100644 --- a/tests/gis_tests/gdal_tests/test_geom.py +++ b/tests/gis_tests/gdal_tests/test_geom.py @@ -1,6 +1,5 @@ import json import pickle -from binascii import b2a_hex from django.contrib.gis.gdal import ( CoordTransform, GDALException, OGRGeometry, OGRGeomType, SpatialReference, @@ -100,7 +99,7 @@ class OGRGeomTest(SimpleTestCase, TestDataMixin): for g in self.geometries.hex_wkt: geom1 = OGRGeometry(g.wkt) wkb = geom1.wkb - self.assertEqual(b2a_hex(wkb).upper(), g.hex.encode()) + self.assertEqual(wkb.hex().upper(), g.hex) # Constructing w/WKB. geom2 = OGRGeometry(wkb) self.assertEqual(geom1, geom2) diff --git a/tests/gis_tests/geos_tests/test_geos.py b/tests/gis_tests/geos_tests/test_geos.py index 0db98285fa..955bb6c5d2 100644 --- a/tests/gis_tests/geos_tests/test_geos.py +++ b/tests/gis_tests/geos_tests/test_geos.py @@ -2,7 +2,7 @@ import ctypes import json import pickle import random -from binascii import a2b_hex, b2a_hex +from binascii import a2b_hex from io import BytesIO from unittest import mock @@ -102,7 +102,7 @@ class GEOSTest(SimpleTestCase, TestDataMixin): for g in self.geometries.hex_wkt: geom = fromstr(g.wkt) wkb = geom.wkb - self.assertEqual(b2a_hex(wkb).decode().upper(), g.hex) + self.assertEqual(wkb.hex().upper(), g.hex) def test_create_hex(self): "Testing creation from HEX." @@ -115,7 +115,7 @@ class GEOSTest(SimpleTestCase, TestDataMixin): def test_create_wkb(self): "Testing creation from WKB." for g in self.geometries.hex_wkt: - wkb = memoryview(a2b_hex(g.hex.encode())) + wkb = memoryview(bytes.fromhex(g.hex)) geom_h = GEOSGeometry(wkb) # we need to do this so decimal places get normalized geom_t = fromstr(g.wkt) |