From 847d9abe31540f337b0754961f68f44584a2fbae Mon Sep 17 00:00:00 2001 From: Julian Rother <julianr@fsmpi.rwth-aachen.de> Date: Mon, 22 Feb 2021 19:37:07 +0100 Subject: [PATCH] Updated init code --- ldap3_mapper_new/__init__.py | 15 +++++++-------- ldap3_mapper_new/{base.py => core.py} | 0 2 files changed, 7 insertions(+), 8 deletions(-) rename ldap3_mapper_new/{base.py => core.py} (100%) diff --git a/ldap3_mapper_new/__init__.py b/ldap3_mapper_new/__init__.py index a071ffe4..4eb8c8f4 100644 --- a/ldap3_mapper_new/__init__.py +++ b/ldap3_mapper_new/__init__.py @@ -1,21 +1,20 @@ import ldap3 -from . import model +from . import model, attribute, relationship -__all__ = ['LDAP3Mapper'] +__all__ = ['LDAPMapper'] -class LDAP3Mapper: +class LDAPMapper: def __init__(self, server=None, bind_dn=None, bind_password=None): - class Session(model.Session): - ldap_mapper = self - class Model(model.Model): ldap_mapper = self - self.Session = Session # pylint: disable=invalid-name self.Model = Model # pylint: disable=invalid-name - self.Attribute = model.Attribute # pylint: disable=invalid-name + self.Session = model.Session # pylint: disable=invalid-name + self.Attribute = attribute.Attribute # pylint: disable=invalid-name + self.Relationship = relationship.Relationship # pylint: disable=invalid-name + self.Backreference = relationship.Backreference # pylint: disable=invalid-name if not hasattr(type(self), 'server'): self.server = server diff --git a/ldap3_mapper_new/base.py b/ldap3_mapper_new/core.py similarity index 100% rename from ldap3_mapper_new/base.py rename to ldap3_mapper_new/core.py -- GitLab