From 1be7e170b6bfab7e2b5b45f47b25ded6fe64d7d6 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 14 Aug 2023 12:06:10 +0200 Subject: [PATCH 1/2] Remove dependency on future library --- pykeepass/attachment.py | 4 +--- pykeepass/entry.py | 4 +--- pykeepass/group.py | 3 --- pykeepass/pykeepass.py | 3 --- requirements-rtd.txt | 1 - requirements.txt | 1 - setup.py | 2 -- 7 files changed, 2 insertions(+), 16 deletions(-) diff --git a/pykeepass/attachment.py b/pykeepass/attachment.py index 11076a1e..77d69e8a 100644 --- a/pykeepass/attachment.py +++ b/pykeepass/attachment.py @@ -2,14 +2,12 @@ from __future__ import unicode_literals from __future__ import print_function from __future__ import absolute_import -from future.utils import python_2_unicode_compatible import pykeepass.entry from pykeepass.exceptions import BinaryError -# FIXME python2 -@python_2_unicode_compatible + class Attachment(object): def __init__(self, element=None, kp=None, id=None, filename=None): self._element = element diff --git a/pykeepass/entry.py b/pykeepass/entry.py index ced33884..09faa044 100644 --- a/pykeepass/entry.py +++ b/pykeepass/entry.py @@ -1,6 +1,5 @@ # FIXME python2 from __future__ import absolute_import, unicode_literals -from future.utils import python_2_unicode_compatible import logging from copy import deepcopy @@ -28,8 +27,7 @@ 'otp' ] -# FIXME python2 -@python_2_unicode_compatible + class Entry(BaseElement): def __init__(self, title=None, username=None, password=None, url=None, diff --git a/pykeepass/group.py b/pykeepass/group.py index 6446ce18..aa8ef520 100644 --- a/pykeepass/group.py +++ b/pykeepass/group.py @@ -1,6 +1,5 @@ # FIXME python2 from __future__ import absolute_import, unicode_literals -from future.utils import python_2_unicode_compatible from lxml.builder import E from lxml.etree import Element, _Element @@ -10,8 +9,6 @@ from pykeepass.baseelement import BaseElement -# FIXME python2 -@python_2_unicode_compatible class Group(BaseElement): def __init__(self, name=None, element=None, icon=None, notes=None, diff --git a/pykeepass/pykeepass.py b/pykeepass/pykeepass.py index 4b38bc7f..615c4045 100644 --- a/pykeepass/pykeepass.py +++ b/pykeepass/pykeepass.py @@ -2,7 +2,6 @@ # FIXME python2 from __future__ import absolute_import, print_function, unicode_literals -from future.utils import python_2_unicode_compatible import base64 import logging @@ -38,8 +37,6 @@ BLANK_DATABASE_PASSWORD = "password" -# FIXME python2 -@python_2_unicode_compatible class PyKeePass(object): """Open a KeePass database diff --git a/requirements-rtd.txt b/requirements-rtd.txt index 4c7815e9..d3882431 100644 --- a/requirements-rtd.txt +++ b/requirements-rtd.txt @@ -3,5 +3,4 @@ pycryptodomex==3.14.1 construct==2.10.68 argon2-cffi==21.3.0 python-dateutil==2.8.2 -future==0.18.2 Sphinx>=3.2.1 diff --git a/requirements.txt b/requirements.txt index 0ab39d70..ca8e7a65 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,3 @@ pycryptodomex==3.14.1 construct==2.10.68 argon2-cffi==21.3.0 python-dateutil==2.8.2 -future==0.18.2 diff --git a/setup.py b/setup.py index 29c230a7..0f190967 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,6 @@ "argon2_cffi", "pycryptodomex>=3.6.2", "lxml", - # FIXME python2 - "future", ], include_package_data=True, ) From 2b32e849dfa4a3d1a9f96c9ffbcaed8e744b5d96 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 14 Aug 2023 12:07:50 +0200 Subject: [PATCH 2/2] Remove imports from __future__ --- pykeepass/__init__.py | 2 -- pykeepass/attachment.py | 5 ----- pykeepass/baseelement.py | 2 -- pykeepass/entry.py | 3 --- pykeepass/group.py | 3 --- pykeepass/pykeepass.py | 5 ----- pykeepass/xpath.py | 3 --- tests/tests.py | 5 ----- 8 files changed, 28 deletions(-) diff --git a/pykeepass/__init__.py b/pykeepass/__init__.py index 9322561b..6464cd01 100644 --- a/pykeepass/__init__.py +++ b/pykeepass/__init__.py @@ -1,4 +1,2 @@ -from __future__ import absolute_import from .pykeepass import PyKeePass, create_database - from pykeepass.version import __version__ diff --git a/pykeepass/attachment.py b/pykeepass/attachment.py index 77d69e8a..b08f3366 100644 --- a/pykeepass/attachment.py +++ b/pykeepass/attachment.py @@ -1,8 +1,3 @@ -# FIXME python2 -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import absolute_import - import pykeepass.entry from pykeepass.exceptions import BinaryError diff --git a/pykeepass/baseelement.py b/pykeepass/baseelement.py index e9ffc391..0ff57c45 100644 --- a/pykeepass/baseelement.py +++ b/pykeepass/baseelement.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import base64 import struct import uuid diff --git a/pykeepass/entry.py b/pykeepass/entry.py index 09faa044..608b7df3 100644 --- a/pykeepass/entry.py +++ b/pykeepass/entry.py @@ -1,6 +1,3 @@ -# FIXME python2 -from __future__ import absolute_import, unicode_literals - import logging from copy import deepcopy from datetime import datetime diff --git a/pykeepass/group.py b/pykeepass/group.py index aa8ef520..1bce2e71 100644 --- a/pykeepass/group.py +++ b/pykeepass/group.py @@ -1,6 +1,3 @@ -# FIXME python2 -from __future__ import absolute_import, unicode_literals - from lxml.builder import E from lxml.etree import Element, _Element from lxml.objectify import ObjectifiedElement diff --git a/pykeepass/pykeepass.py b/pykeepass/pykeepass.py index 615c4045..29821eb8 100644 --- a/pykeepass/pykeepass.py +++ b/pykeepass/pykeepass.py @@ -1,8 +1,3 @@ -# coding: utf-8 - -# FIXME python2 -from __future__ import absolute_import, print_function, unicode_literals - import base64 import logging import os diff --git a/pykeepass/xpath.py b/pykeepass/xpath.py index 5fe624b1..c4e6fea5 100644 --- a/pykeepass/xpath.py +++ b/pykeepass/xpath.py @@ -1,6 +1,3 @@ -# FIXME python2 -from __future__ import unicode_literals - attachment_xp = { False: { 'id': '/Value[@Ref="{}"]/..', diff --git a/tests/tests.py b/tests/tests.py index bcabe355..7e3b1718 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -1,8 +1,3 @@ -# -*- coding: utf-8 -*- - -# FIXME python2 -from __future__ import unicode_literals - import logging import os import shutil