python-win-ad 0.6.2__py3-none-any.whl → 0.6.4__py3-none-any.whl

pyad/__init__.py

@@ -1,67 +1,73 @@
-__all__ = [
-    "set_defaults",
-    "ADQuery",
-    "ADComputer",
-    "ADContainer",
-    "ADDomain",
-    "ADGroup",
-    "ADUser",
-    "from_cn",
-    "from_dn",
-    "from_guid",
-    "comException",
-    "genericADSIException",
-    "win32Exception",
-    "invalidOwnerException",
-    "noObjectFoundException",
-    "InvalidObjectException",
-    "InvalidAttribute",
-    "noExecutedQuery",
-    "invalidResults",
-]
-
-
-def _check_requirements():
-    import sys
-    import importlib
-
-    required_version = (3, 6)
-    cont = True
-    msg = []
-    if sys.version_info < required_version:
-        raise ImportError("Requires at least Python 3.6")
-    if sys.platform != "win32":
-        raise Exception("Must be running Windows in order to use pyad.")
-    for x in ["win32api", "pywintypes", "win32com", "win32security"]:
-        try:
-            importlib.import_module(x)
-        except ModuleNotFoundError:
-            cont = False
-            msg.append(f"{x}")
-    if not cont:
-        raise ImportError(
-            "Please ensure the following packages are installed: " + ", ".join(msg)
-        )
-
-
-_check_requirements()
-
-from .adbase import set_defaults
-from .adquery import ADQuery
-from .adcomputer import ADComputer
-from .adcontainer import ADContainer
-from .addomain import ADDomain
-from .adgroup import ADGroup
-from .aduser import ADUser
-from .pyad import from_cn, from_dn, from_guid
-from .pyadexceptions import (
-    comException,
-    genericADSIException,
-    win32Exception,
-    invalidOwnerException,
-    noObjectFoundException,
-    InvalidObjectException,
-    InvalidAttribute,
-    noExecutedQuery,
-    invalidResults,
-)
+
+__all__ = [
+    "set_defaults",
+    "ADQuery",
+    "ADComputer",
+    "ADContainer",
+    "ADDomain",
+    "ADGroup",
+    "ADUser",
+    "from_cn",
+    "from_dn",
+    "from_guid",
+    "comException",
+    "genericADSIException",
+    "win32Exception",
+    "invalidOwnerException",
+    "noObjectFoundException",
+    "InvalidObjectException",
+    "InvalidAttribute",
+    "noExecutedQuery",
+    "invalidResults",
+]
+
+
+def _check_requirements():
+    import sys
+    import importlib
+
+    required_version = (3, 6)
+    cont = True
+    msg = []
+    if sys.version_info < required_version:
+        raise ImportError("Requires at least Python 3.6")
+    if sys.platform != "win32":
+        raise Exception("Must be running Windows in order to use pyad.")
+    for x in ["win32api", "pywintypes", "win32com", "win32security"]:
+        try:
+            importlib.import_module(x)
+        except ModuleNotFoundError:
+            cont = False
+            msg.append(f"{x}")
+    if not cont:
+        raise ImportError(
+            "Please ensure the following packages are installed: " + ", ".join(msg)
+        )
+
+
+_check_requirements()
+
+from .adbase import set_defaults
+from .adquery import ADQuery
+from .adcomputer import ADComputer
+from .adcontainer import ADContainer
+from .addomain import ADDomain
+from .adgroup import ADGroup
+from .aduser import ADUser
+from .pyad import from_cn, from_dn, from_guid
+from .pyadexceptions import (
+    comException,
+    genericADSIException,
+    win32Exception,
+    invalidOwnerException,
+    noObjectFoundException,
+    InvalidObjectException,
+    InvalidAttribute,
+    noExecutedQuery,
+    invalidResults,
+)
+
+
+if __name__ == "__main__":
+    import logging
+    logging.basicConfig(level=logging.WARNING)

pyad/adbase.py

@@ -1,17 +1,20 @@
+import logging
 import sys
 import win32com.client
 
 from .pyadexceptions import SetupError
 
+logger = logging.getLogger(__name__)
 _adsi_provider = win32com.client.Dispatch("ADsNameSpaces")
 
 try:
     # Discover default domain and forest information
     __default_domain_obj = _adsi_provider.GetObject("", "LDAP://rootDSE")
 except:
-    # If there was an error, this this computer might not be on a domain.
-    print(
-        "WARN: unable to connect to default domain. Computer is likely not attached to an AD domain"
+    # If there was an error, this computer might not be on a domain.
+    logger.debug(
+        "Unable to connect to default domain. "
+        "Computer is likely not attached to an AD domain."
     )
     __default_domain_obj = None
     _default_detected_forest = None

pyad/adcontainer.py

@@ -1,238 +1,238 @@
-import pywintypes
-
-from typing import Any, Dict, List
-from .adobject import ADObject
-from .aduser import ADUser
-from .adcomputer import ADComputer
-from .adgroup import ADGroup
-from . import pyadconstants
-from . import pyadutils
-
-
-class ADContainer(ADObject):
-    def get_children_iter(
-        self, recursive: bool = False, filter: List[ADObject] = None
-    ) -> ADObject:
-        """
-        Iterate over the children objects in the container.
-
-        :param recursive: enumerate all containers with in the object,
-            defaults to False
-        :type recursive: bool, optional
-        :param filter: filter to only specific object classes ie ADUser,
-            defaults to None
-        :type filter: List[ADObject], optional
-        :yield: _description_
-        :rtype: _type_
-        """
-        for com_object in self._ldap_adsi_obj:
-            q = ADObject.from_com_object(com_object)
-            q.adjust_pyad_type()
-            if q.type == "organizationalUnit" and recursive:
-                for c in q.get_children_iter(recursive=recursive):
-                    if not filter or c.__class__ in filter:
-                        yield c
-            if not filter or q.__class__ in filter:
-                yield q
-
-    def get_children(
-        self, recursive: bool = False, filter: List[ADObject] = None
-    ) -> list:
-        """
-        returns a list of child containers with in the current container. Optionally
-        the list can be filtered to specific object classes and search through child
-        containers recursively.
-
-        :param recursive: include children from sub-containers, defaults to False
-        :type recursive: bool, optional
-        :param filter: filter to only specific object classes ie ADUser, defaults to None
-        :type filter: List[ADObject], optional
-        :return: a list of all child objects
-        :rtype: list
-        """
-
-        return list(self.get_children_iter(recursive=recursive, filter=filter))
-
-    def __create_object(self, type_: str, name: str) -> ADObject:
-        prefix = "ou" if type_ == "organizationalUnit" else "cn"
-        prefixed_name = "=".join((prefix, name))
-        return self._ldap_adsi_obj.Create(type_, prefixed_name)
-
-    def create_user(
-        self,
-        name: str,
-        password: str = None,
-        upn_suffix: str = None,
-        enable: bool = True,
-        optional_attributes: dict = {},
-    ) -> ADUser:
-        """
-        Create a new user object in the container.
-
-        :param name: The name of the user
-        :type name: str
-        :param password: The password for the user it is strongly recommended to
-            populate this parameter as the account will be created with password
-            not required which will not get clear within AD leading to a security
-            vulnerability.
-        :type password: str, optional
-        :param upn_suffix: The upn suffix for the user, defaults to default upn
-            suffix for the domain.
-        :type upn_suffix: str, optional
-        :param enable: Whether the user should be enabled or disabled, defaults to True
-        :type enable: bool, optional
-        :param optional_attributes: List of additional attribute to set, defaults to {}
-        :type optional_attributes: dict, optional
-        :return: the created user object
-        :rtype: ADUser
-        """
-
-        pyadobj = None
-
-        try:
-            if not upn_suffix:
-                upn_suffix = self.get_domain().get_default_upn()
-            upn = "@".join((name, upn_suffix))
-            obj = self.__create_object("user", name)
-            obj.Put("sAMAccountName", optional_attributes.get("sAMAccountName", name))
-            obj.Put("userPrincipalName", upn)
-            obj.SetInfo()
-            pyadobj = ADUser.from_com_object(obj)
-
-            if enable:
-                pyadobj.enable()
-
-            if password:
-                pyadobj.set_password(password)
-                pyadobj.set_user_account_control_setting("PASSWD_NOTREQD", False)
-
-            pyadobj.set_user_account_control_setting("NORMAL_ACCOUNT", True)
-            pyadobj.update_attributes(optional_attributes)
-            return pyadobj
-        except pywintypes.com_error as e:
-            if pyadobj:
-                # clean up the object if it was created
-                pyadobj.delete()
-            pyadutils.pass_up_com_exception(e)
-
-    def create_group(
-        self,
-        name: str,
-        security_enabled: bool = True,
-        scope: str = "GLOBAL",
-        optional_attributes: Dict[str, Any] = {},
-    ) -> ADGroup:
-        """
-        Create a new group object in the container
-
-        :param name: The Group Name
-        :type name: str
-        :param security_enabled: If this is a security enabled group or a distribution
-            group, defaults to True
-        :type security_enabled: bool, optional
-        :param scope: The scope of group. Must be one of [GLOBAL, LOCAL, UNIVERSAL].
-            Defaults to "GLOBAL"
-        :type scope: str, optional
-        :param optional_attributes: Additional attributes to set when creating the
-            object, defaults to {}
-        :type optional_attributes: Dict[str,Any], optional
-        :return: The created group object
-        :rtype: ADGroup
-        """
-
-        obj = None
-
-        try:
-            obj = self.__create_object("group", name)
-            obj.Put("sAMAccountName", name)
-            val = pyadconstants.ADS_GROUP_TYPE[scope]
-            if security_enabled:
-                val = val | pyadconstants.ADS_GROUP_TYPE["SECURITY_ENABLED"]
-            obj.Put("groupType", val)
-            obj.SetInfo()
-            pyadobj = ADGroup.from_com_object(obj)
-            pyadobj.update_attributes(optional_attributes)
-            return pyadobj
-        except pywintypes.com_error as e:
-            if obj:
-                obj.delete()
-            pyadutils.pass_up_com_exception(e)
-        except KeyError:
-            if obj:
-                obj.delete()
-            raise ValueError(f"Invalid scope: {scope}")
-
-    def create_container(
-        self, name: str, optional_attributes: Dict[str, Any] = {}
-    ) -> "ADContainer":
-        """
-        Create a new organizational unit in the container
-
-        :param name: The name of the container
-        :type name: str
-        :param optional_attributes: Additional attributes to set when creating the
-            object, defaults to {}
-        :type optional_attributes: Dict[str,Any], optional
-        :return: the created container object
-        :rtype: ADContainer
-        """
-
-        obj = None
-
-        try:
-            obj = self.__create_object("organizationalUnit", name)
-            obj.SetInfo()
-            pyadobj = ADContainer.from_com_object(obj)
-            pyadobj.update_attributes(optional_attributes)
-            return pyadobj
-        except pywintypes.com_error as e:
-            if obj:
-                obj.delete()
-            pyadutils.pass_up_com_exception(e)
-
-    def create_computer(
-        self, name: str, enable: bool = True, optional_attributes: Dict[str, Any] = {}
-    ) -> ADComputer:
-        """
-        Create a new computer object in the container
-
-        :param name: The computer name
-        :type name: str
-        :param enable: Whether the computer should be enabled or disabled,
-            defaults to True
-        :type enable: bool, optional
-        :param optional_attributes: Additional attributes to set when creating the
-            object, defaults to {}
-        :type optional_attributes: Dict[str,Any], optional
-        :return: the created computer object
-        :rtype: ADComputer
-        """
-
-        obj = None
-
-        try:
-            obj = self.__create_object("computer", name)
-            obj.Put("sAMAccountName", name + "$")
-            if enable:
-                obj.Put("userAccountControl", 4128)
-            else:
-                obj.Put("userAccountControl", 4130)
-            obj.SetInfo()
-            pyadobj = ADComputer.from_com_object(obj)
-            if enable:
-                pyadobj.enable()
-            pyadobj.update_attributes(optional_attributes)
-            return pyadobj
-        except pywintypes.com_error as e:
-            if obj:
-                obj.delete()
-            pyadutils.pass_up_com_exception(e)
-
-    def remove_child(self, child: ADObject) -> None:
-        """Removes the child object from the domain"""
-
-        self._ldap_adsi_obj.Delete(child.type, child.prefixed_cn)
-
-
-ADObject._py_ad_object_mappings["organizationalUnit"] = ADContainer
-ADObject._py_ad_object_mappings["container"] = ADContainer
+import pywintypes
+
+from typing import Any, Dict, List
+from .adobject import ADObject
+from .aduser import ADUser
+from .adcomputer import ADComputer
+from .adgroup import ADGroup
+from . import pyadconstants
+from . import pyadutils
+
+
+class ADContainer(ADObject):
+    def get_children_iter(
+        self, recursive: bool = False, filter: List[ADObject] = None
+    ) -> ADObject:
+        """
+        Iterate over the children objects in the container.
+
+        :param recursive: enumerate all containers with in the object,
+            defaults to False
+        :type recursive: bool, optional
+        :param filter: filter to only specific object classes ie ADUser,
+            defaults to None
+        :type filter: List[ADObject], optional
+        :yield: _description_
+        :rtype: _type_
+        """
+        for com_object in self._ldap_adsi_obj:
+            q = ADObject.from_com_object(com_object)
+            q.adjust_pyad_type()
+            if q.type == "organizationalUnit" and recursive:
+                for c in q.get_children_iter(recursive=recursive):
+                    if not filter or c.__class__ in filter:
+                        yield c
+            if not filter or q.__class__ in filter:
+                yield q
+
+    def get_children(
+        self, recursive: bool = False, filter: List[ADObject] = None
+    ) -> list:
+        """
+        returns a list of child containers with in the current container. Optionally
+        the list can be filtered to specific object classes and search through child
+        containers recursively.
+
+        :param recursive: include children from sub-containers, defaults to False
+        :type recursive: bool, optional
+        :param filter: filter to only specific object classes ie ADUser, defaults to None
+        :type filter: List[ADObject], optional
+        :return: a list of all child objects
+        :rtype: list
+        """
+
+        return list(self.get_children_iter(recursive=recursive, filter=filter))
+
+    def __create_object(self, type_: str, name: str) -> ADObject:
+        prefix = "ou" if type_ == "organizationalUnit" else "cn"
+        prefixed_name = "=".join((prefix, name))
+        return self._ldap_adsi_obj.Create(type_, prefixed_name)
+
+    def create_user(
+        self,
+        name: str,
+        password: str = None,
+        upn_suffix: str = None,
+        enable: bool = True,
+        optional_attributes: dict = {},
+    ) -> ADUser:
+        """
+        Create a new user object in the container.
+
+        :param name: The name of the user
+        :type name: str
+        :param password: The password for the user it is strongly recommended to
+            populate this parameter as the account will be created with password
+            not required which will not get clear within AD leading to a security
+            vulnerability.
+        :type password: str, optional
+        :param upn_suffix: The upn suffix for the user, defaults to default upn
+            suffix for the domain.
+        :type upn_suffix: str, optional
+        :param enable: Whether the user should be enabled or disabled, defaults to True
+        :type enable: bool, optional
+        :param optional_attributes: List of additional attribute to set, defaults to {}
+        :type optional_attributes: dict, optional
+        :return: the created user object
+        :rtype: ADUser
+        """
+
+        pyadobj = None
+
+        try:
+            if not upn_suffix:
+                upn_suffix = self.get_domain().get_default_upn()
+            upn = "@".join((name, upn_suffix))
+            obj = self.__create_object("user", name)
+            obj.Put("sAMAccountName", optional_attributes.get("sAMAccountName", name))
+            obj.Put("userPrincipalName", upn)
+            obj.SetInfo()
+            pyadobj = ADUser.from_com_object(obj)
+
+            if enable:
+                pyadobj.enable()
+
+            if password:
+                pyadobj.set_password(password)
+                pyadobj.set_user_account_control_setting("PASSWD_NOTREQD", False)
+
+            pyadobj.set_user_account_control_setting("NORMAL_ACCOUNT", True)
+            pyadobj.update_attributes(optional_attributes)
+            return pyadobj
+        except pywintypes.com_error as e:
+            if pyadobj:
+                # clean up the object if it was created
+                pyadobj.delete()
+            pyadutils.pass_up_com_exception(e)
+
+    def create_group(
+        self,
+        name: str,
+        security_enabled: bool = True,
+        scope: str = "GLOBAL",
+        optional_attributes: Dict[str, Any] = {},
+    ) -> ADGroup:
+        """
+        Create a new group object in the container
+
+        :param name: The Group Name
+        :type name: str
+        :param security_enabled: If this is a security enabled group or a distribution
+            group, defaults to True
+        :type security_enabled: bool, optional
+        :param scope: The scope of group. Must be one of [GLOBAL, LOCAL, UNIVERSAL].
+            Defaults to "GLOBAL"
+        :type scope: str, optional
+        :param optional_attributes: Additional attributes to set when creating the
+            object, defaults to {}
+        :type optional_attributes: Dict[str,Any], optional
+        :return: The created group object
+        :rtype: ADGroup
+        """
+
+        obj = None
+
+        try:
+            obj = self.__create_object("group", name)
+            obj.Put("sAMAccountName", name)
+            val = pyadconstants.ADS_GROUP_TYPE[scope]
+            if security_enabled:
+                val = val | pyadconstants.ADS_GROUP_TYPE["SECURITY_ENABLED"]
+            obj.Put("groupType", val)
+            obj.SetInfo()
+            pyadobj = ADGroup.from_com_object(obj)
+            pyadobj.update_attributes(optional_attributes)
+            return pyadobj
+        except pywintypes.com_error as e:
+            if obj:
+                obj.delete()
+            pyadutils.pass_up_com_exception(e)
+        except KeyError:
+            if obj:
+                obj.delete()
+            raise ValueError(f"Invalid scope: {scope}")
+
+    def create_container(
+        self, name: str, optional_attributes: Dict[str, Any] = {}
+    ) -> "ADContainer":
+        """
+        Create a new organizational unit in the container
+
+        :param name: The name of the container
+        :type name: str
+        :param optional_attributes: Additional attributes to set when creating the
+            object, defaults to {}
+        :type optional_attributes: Dict[str,Any], optional
+        :return: the created container object
+        :rtype: ADContainer
+        """
+
+        obj = None
+
+        try:
+            obj = self.__create_object("organizationalUnit", name)
+            obj.SetInfo()
+            pyadobj = ADContainer.from_com_object(obj)
+            pyadobj.update_attributes(optional_attributes)
+            return pyadobj
+        except pywintypes.com_error as e:
+            if obj:
+                obj.delete()
+            pyadutils.pass_up_com_exception(e)
+
+    def create_computer(
+        self, name: str, enable: bool = True, optional_attributes: Dict[str, Any] = {}
+    ) -> ADComputer:
+        """
+        Create a new computer object in the container
+
+        :param name: The computer name
+        :type name: str
+        :param enable: Whether the computer should be enabled or disabled,
+            defaults to True
+        :type enable: bool, optional
+        :param optional_attributes: Additional attributes to set when creating the
+            object, defaults to {}
+        :type optional_attributes: Dict[str,Any], optional
+        :return: the created computer object
+        :rtype: ADComputer
+        """
+
+        obj = None
+
+        try:
+            obj = self.__create_object("computer", name)
+            obj.Put("sAMAccountName", name + "$")
+            if enable:
+                obj.Put("userAccountControl", 4128)
+            else:
+                obj.Put("userAccountControl", 4130)
+            obj.SetInfo()
+            pyadobj = ADComputer.from_com_object(obj)
+            if enable:
+                pyadobj.enable()
+            pyadobj.update_attributes(optional_attributes)
+            return pyadobj
+        except pywintypes.com_error as e:
+            if obj:
+                obj.delete()
+            pyadutils.pass_up_com_exception(e)
+
+    def remove_child(self, child: ADObject) -> None:
+        """Removes the child object from the domain"""
+
+        self._ldap_adsi_obj.Delete(child.type, child.prefixed_cn)
+
+
+ADObject._py_ad_object_mappings["organizationalUnit"] = ADContainer
+ADObject._py_ad_object_mappings["container"] = ADContainer

pyad/adobject.py

@@ -1,3 +1,4 @@
+import logging
 import win32com
 import pywintypes
 import time
@@ -16,6 +17,7 @@ from .pyadconstants import (
     ADS_USER_FLAG,
 )
 
+logger = logging.getLogger(__name__)
 
 @total_ordering
 class ADObject(ADBase):
@@ -664,7 +666,7 @@ class ADObject(ADBase):
                             )
                         node.appendChild(text)
                     except:
-                        print("attribute: %s not xml-able" % attribute)
+                        logger.error("attribute: %s not xml-able" % attribute)
                 else:
                     node.setAttribute("type", "multiValued")
                     ok_elem = False
@@ -684,7 +686,7 @@ class ADObject(ADBase):
                                 node.appendChild(valnode)
                                 ok_elem = True
                     except:
-                        print("attribute: %s not xml-able" % attribute)
+                        logger.error("attribute: %s not xml-able" % attribute)
                 if ok_elem:
                     adobj_xml_doc.appendChild(node)
         return doc.toxml(encoding="UTF-8")

{python_win_ad-0.6.2.dist-info → python_win_ad-0.6.4.dist-info}/METADATA

@@ -1,32 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-win-ad
-Version: 0.6.2
+Version: 0.6.4
 Summary: An Object-Oriented Active Directory management framework built on ADSI
-Home-page: https://github.com/jcarswell/pyad/
-Author: Zakir Durumeric
-Author-email: zakird@gmail.com
-Maintainer: Josh Carswell
-Maintainer-email: Josh.Carswell@thecarswells.ca
-License: Apache License, Version 2.0
-Project-URL: Documentation, https://jcarswell.github.io/pyad/
+Project-URL: Homepage, https://github.com/jcarswell/pyad/
 Project-URL: Issues, https://github.com/jcarswell/pyad/issues/
-Keywords: python microsoft windows active directory AD adsi
-Classifier: License :: OSI Approved :: Apache Software License
+Project-URL: Documentation, https://jcarswell.github.io/pyad/
+Project-URL: Changelog, https://github.com/jcarswell/pyad/blob/main/CHANGELOG
+Author-email: Zakir Durumeric <zakird@gmail.com>
+Maintainer-email: Josh Carswell <Josh.Carswell@thecarswells.ca>
+License-Expression: Apache-2.0
+License-File: LICENSE
+Keywords: AD,active directory,adsi,microsoft,pyad,python,windows active directory
+Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: Microsoft :: Windows
-Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Obsoletes: pyad
+Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
 Requires-Python: >=3.6
-License-File: LICENSE
-Requires-Dist: setuptools
-Requires-Dist: pywin32
+Requires-Dist: pywin32>=301
+Description-Content-Type: text/x-rst
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :align: center
@@ -38,8 +32,9 @@ Introduction
 
 pyad is a Python library designed to provide a simple, Pythonic interface to Active Directory
 through ADSI on the Windows platform. Complete documentation can be found at
-http://jcarswell.github.io/pyad/. Code is maintained at https://github.com/jcarswell/pyad. The 
-library can be downloaded from PyPI at https://github.com/jcarswell/pyad.
+http://jcarswell.github.io/pyad/. Code is maintained at https://github.com/jcarswell/pyad. 
+
+This library is published on PyPI as python-win-ad.
 
 Breaking Changes from upstream
 ------------------------------

{python_win_ad-0.6.2.dist-info → python_win_ad-0.6.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pyad/__init__.py,sha256=y_NCgMefngD034sVrtAC--JMW1pXZ7_2Glwp9-4nqCw,1691
-pyad/adbase.py,sha256=cdFIadGftHJYZHH1_Byz6h1JbNgRihy4CqqH_Na1Ak4,2954
+pyad/__init__.py,sha256=eZUsDn6j8yJwHX4M0byATQn8gK3r5a8RTYBy7yvgfwY,1720
+pyad/adbase.py,sha256=_VvQiLKqKyuumDoPFv2hpdlAoDVatIQF99B9tlq30Pk,3017
 pyad/adcomputer.py,sha256=Wnsx-aD0ugOsgUyHx__6GWd2ogk3aiv4ARqhI_AoPZk,1109
-pyad/adcontainer.py,sha256=dod_T6o7k-2cUmSVragtJnQrlaNwe7Mx5sNCexxbrjQ,8817
+pyad/adcontainer.py,sha256=6GA50aQnF4YpdtT88lrfxXOTxadXXfTOOfaUi4aDldU,8579
 pyad/addomain.py,sha256=ppCUyONuNJAFVPxxCl4Z2o1-Lp0XesS3Wo1ao0YEoDg,850
 pyad/adgroup.py,sha256=nevw3ZBAw58o_qYoXn7dN1bnOvIuwfsZMbZH6cF_dlM,11377
-pyad/adobject.py,sha256=s8z96pBJQ5firLxioamiikbuoD4XRCCKrzwcbDR1AfA,30723
+pyad/adobject.py,sha256=7_497WoGXjdvVGfm5SuszFXEH5rK4R6E7WFFdVM8Rc8,30791
 pyad/adquery.py,sha256=tv0dKkBgcSnhU7Garv6jAEGiUJkwC256I3o2jUpCS7M,10820
 pyad/adsearch.py,sha256=a24vVolTRINQpmuQ3Ldq_2hlHXl9r700vjilINqXk8M,2702
 pyad/aduser.py,sha256=DK0ADC0qXLUodTW0cphvgg8-0iSewaoYw5rSTtje6Dg,3936
@@ -12,8 +12,7 @@ pyad/pyad.py,sha256=moPUvolc0vI-JIIIjW8otUclgkUov0fT1pym1vufdNs,1091
 pyad/pyadconstants.py,sha256=wny29f6aAYhRosWp-lXp_2Rn8HCn3J0BI_G1XFMg5DA,6739
 pyad/pyadexceptions.py,sha256=R8q5dSsqOgULpqVYoz2yvNi6lENZ9wg0PZQnp2Y1sWg,2149
 pyad/pyadutils.py,sha256=0c3wTZEUCv3WE59SO3bzJYfhaO10HsCbQS1D3lo9X10,10486
-python_win_ad-0.6.2.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-python_win_ad-0.6.2.dist-info/METADATA,sha256=T6hmO0w5N35fJCZkvyyk_BycGaHiJnBMNtmiyBla66c,3313
-python_win_ad-0.6.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-python_win_ad-0.6.2.dist-info/top_level.txt,sha256=nRuluAlQ0ORm6J1nBi_n7OlMbbqTp7JDtl3g14wpSmI,5
-python_win_ad-0.6.2.dist-info/RECORD,,
+python_win_ad-0.6.4.dist-info/METADATA,sha256=daYXP9NCLg4XUIopGKcB49OnEmbWc1VHLzvhvjtmQ3I,3171
+python_win_ad-0.6.4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_win_ad-0.6.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+python_win_ad-0.6.4.dist-info/RECORD,,

{python_win_ad-0.6.2.dist-info → python_win_ad-0.6.4.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: hatchling 1.29.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

{python_win_ad-0.6.2.dist-info → python_win_ad-0.6.4.dist-info/licenses}/LICENSE

@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

python_win_ad-0.6.2.dist-info/top_level.txt

@@ -1 +0,0 @@
-pyad