From 6251dfaeaf414eb83d727dd2020d37d98c29f32d Mon Sep 17 00:00:00 2001 From: Julian Rother <julian@jrother.eu> Date: Wed, 17 Nov 2021 16:40:58 +0100 Subject: [PATCH] Cleanup of top-level imports --- ldapserver/__init__.py | 8 +++++--- ldapserver/dn.py | 2 +- ldapserver/objects.py | 2 ++ ldapserver/server.py | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ldapserver/__init__.py b/ldapserver/__init__.py index 4435599..c749ca5 100644 --- a/ldapserver/__init__.py +++ b/ldapserver/__init__.py @@ -1,6 +1,8 @@ from . import ldap -from . import dn from . import exceptions +from . import schema +from . import rfc4518_stringprep -from .server import BaseLDAPRequestHandler, LDAPRequestHandler -from .objects import SubschemaSubentry +from .dn import * +from .objects import * +from .server import * diff --git a/ldapserver/dn.py b/ldapserver/dn.py index 2895537..eb90cbc 100644 --- a/ldapserver/dn.py +++ b/ldapserver/dn.py @@ -19,7 +19,7 @@ import re from . import exceptions -__all__ = ['DN', 'RDN', 'RDNAssertion'] +__all__ = ['DN', 'RDN', 'RDNAssertion', 'DNWithUID'] class DN(tuple): '''Distinguished Name consiting of zero ore more `RDN` objects''' diff --git a/ldapserver/objects.py b/ldapserver/objects.py index 0accdce..c568470 100644 --- a/ldapserver/objects.py +++ b/ldapserver/objects.py @@ -4,6 +4,8 @@ import enum from . import ldap, exceptions from .dn import DN, RDN, RDNAssertion +__all__ = ['AttributeDict', 'Object', 'RootDSE', 'WILDCARD_VALUE', 'ObjectTemplate', 'SubschemaSubentry'] + class TypeKeysView(collections.abc.Set): def __init__(self, attributes): self.__attributes = attributes diff --git a/ldapserver/server.py b/ldapserver/server.py index e50c5e2..3a7d5d8 100644 --- a/ldapserver/server.py +++ b/ldapserver/server.py @@ -10,6 +10,8 @@ import itertools from . import asn1, exceptions, ldap, schema, objects +__all__ = ['BaseLDAPRequestHandler', 'LDAPRequestHandler'] + def pop_control(controls, oid): result = None remaining_controls = [] -- GitLab