Merge pull request #60 from a-detiste/master

remove dependency on deprecated python3-six
rroemhild · Oct 29, 2023 · d92edea · d92edea
2 parents d2f7fd4 + 756c900
commit d92edea
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 24 deletions.
diff --git a/Pipfile b/Pipfile
@@ -5,7 +5,6 @@ name = "pypi"
 
 [packages]
 ldap3 = ">=2.3"
-six = ">=1.10"
 Flask = ">=0.12"
 
 [dev-packages]

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/flask_ldapconn/entry.py b/flask_ldapconn/entry.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import json
 from flask import current_app
-from six import add_metaclass
 from ldap3.utils.dn import safe_dn
 from ldap3.utils.conv import check_json_dict, format_json
 from ldap3.core.exceptions import LDAPAttributeError
@@ -33,8 +32,7 @@ def query(cls):
         return BaseQuery(cls)
 
 
-@add_metaclass(LDAPEntryMeta)
-class LDAPEntry(object):
+class LDAPEntry(object, metaclass=LDAPEntryMeta):
 
     base_dn = None
     entry_rdn = ['cn']

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,2 @@
-six>=1.10
 Flask>=0.12
 ldap3>=2.3
diff --git a/setup.py b/setup.py
@@ -29,7 +29,6 @@
     install_requires=[
         'Flask>=0.12',
         'ldap3>=2.3',
-        'six>=1.10'
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',