From 60cbe4fccb6b36796d165f16cf6e562658ac1a3f Mon Sep 17 00:00:00 2001 From: "Tobias Wellnitz, DH1TW" Date: Sun, 24 Dec 2023 02:04:25 +0100 Subject: [PATCH] removed future (2.7 compatibility) --- pyhamtools/locator.py | 1 - pyhamtools/lookuplib.py | 1 - pyhamtools/qsl.py | 3 +-- setup.py | 1 - test/test_clublog.py | 3 +-- test/test_lookuplib.py | 1 - test/test_lookuplib_gettersetter_api.py | 1 - test/test_lotw.py | 3 +-- 8 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pyhamtools/locator.py b/pyhamtools/locator.py index 0660892..707534b 100644 --- a/pyhamtools/locator.py +++ b/pyhamtools/locator.py @@ -1,4 +1,3 @@ -from __future__ import division from math import pi, sin, cos, atan2, sqrt, radians, log, tan, degrees from datetime import datetime diff --git a/pyhamtools/lookuplib.py b/pyhamtools/lookuplib.py index 28e0b18..6193611 100644 --- a/pyhamtools/lookuplib.py +++ b/pyhamtools/lookuplib.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import os import logging import logging.config diff --git a/pyhamtools/qsl.py b/pyhamtools/qsl.py index da1e891..ca41fb0 100644 --- a/pyhamtools/qsl.py +++ b/pyhamtools/qsl.py @@ -1,4 +1,3 @@ -from future.utils import iteritems from datetime import datetime import re @@ -125,7 +124,7 @@ def get_clublog_users(**kwargs): error_count = 0 - for call, call_data in iteritems(cl_data): + for call, call_data in cl_data.items(): try: data = {} if "firstqso" in call_data: diff --git a/setup.py b/setup.py index a4194df..e8a2284 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ setup(name='pyhamtools', "ephem>=4.1.3", "beautifulsoup4>=4.7.1", "lxml>=4.8.0", - "future>=0.18.2", "redis>=2.10.6", ], **kw diff --git a/test/test_clublog.py b/test/test_clublog.py index c9bf6b9..38eee32 100644 --- a/test/test_clublog.py +++ b/test/test_clublog.py @@ -3,7 +3,6 @@ import sys import datetime import pytest -from future.utils import iteritems from pyhamtools.qsl import get_clublog_users @@ -26,7 +25,7 @@ class Test_clublog_methods: data = get_clublog_users() assert isinstance(data, dict) - for key, value in iteritems(data): + for key, value in data.items(): assert isinstance(key, unicode) assert isinstance(value, dict) diff --git a/test/test_lookuplib.py b/test/test_lookuplib.py index f138ce6..8d7ff19 100644 --- a/test/test_lookuplib.py +++ b/test/test_lookuplib.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import pytest import sys diff --git a/test/test_lookuplib_gettersetter_api.py b/test/test_lookuplib_gettersetter_api.py index 8274f17..5e0f5fe 100644 --- a/test/test_lookuplib_gettersetter_api.py +++ b/test/test_lookuplib_gettersetter_api.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import pytest import tempfile import os diff --git a/test/test_lotw.py b/test/test_lotw.py index 7ea4e53..4be552e 100644 --- a/test/test_lotw.py +++ b/test/test_lotw.py @@ -3,7 +3,6 @@ import sys import datetime from .execfile import execfile -from future.utils import iteritems import pytest def execfile(filepath, globals=None, locals=None): @@ -38,7 +37,7 @@ class Test_lotw_methods: data = get_lotw_users() assert isinstance(data, dict) - for key, value in iteritems(data): + for key, value in data.items(): assert isinstance(key, unicode) assert isinstance(value, datetime.datetime ) assert len(data) > 1000