Deprecate Python2 (#350)

* remove python2 future imports

* remove object as parent class

* remove python2 packages from requires

Author: pwall2222

pykeepass/attachment.py

@@ -1,15 +1,7 @@
-# FIXME python2
-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

pykeepass/baseelement.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import base64
 import struct
 import uuid
@@ -8,7 +6,7 @@
 from datetime import datetime
 
 
-class BaseElement(object):
+class BaseElement():
     """Entry and Group inherit from this class"""
 
     def __init__(self, element, kp=None, icon=None, expires=False,

pykeepass/entry.py

@@ -1,7 +1,3 @@
-# FIXME python2
-from __future__ import absolute_import, unicode_literals
-from future.utils import python_2_unicode_compatible
-
 import logging
 from copy import deepcopy
 from datetime import datetime
@@ -28,8 +24,6 @@
     'otp'
 ]
 
-# FIXME python2
-@python_2_unicode_compatible
 class Entry(BaseElement):
 
     def __init__(self, title=None, username=None, password=None, url=None,

pykeepass/group.py

@@ -1,7 +1,3 @@
-# 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
 from lxml.objectify import ObjectifiedElement
@@ -10,8 +6,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,

pykeepass/pykeepass.py

@@ -1,9 +1,4 @@
 # coding: utf-8
-
-# FIXME python2
-from __future__ import absolute_import, print_function, unicode_literals
-from future.utils import python_2_unicode_compatible
-
 import base64
 import logging
 import os
@@ -38,9 +33,7 @@
 BLANK_DATABASE_PASSWORD = "password"
 
 
-# FIXME python2
-@python_2_unicode_compatible
-class PyKeePass(object):
+class PyKeePass():
     """Open a KeePass database
 
     Args:

pykeepass/xpath.py

@@ -1,6 +1,3 @@
-# FIXME python2
-from __future__ import unicode_literals
-
 attachment_xp = {
     False: {
         'id': '/Value[@Ref="{}"]/..',

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

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

setup.py

@@ -21,13 +21,10 @@
     packages=find_packages(include=['pykeepass', 'pykeepass.*']),
     install_requires=[
         "python-dateutil",
-        # FIXME python2 - last version to support python2
-        "construct==2.10.68",
+        "construct",
         "argon2_cffi",
         "pycryptodomex>=3.6.2",
         "lxml",
-        # FIXME python2
-        "future",
     ],
     include_package_data=True,
 )

tests/tests.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# FIXME python2
-from __future__ import unicode_literals
-
 import logging
 import os
 import shutil