python-win-ad 0.6.2__tar.gz → 0.6.3__tar.gz

{python-win-ad-0.6.2 → python_win_ad-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-win-ad
-Version: 0.6.2
+Version: 0.6.3
 Summary: An Object-Oriented Active Directory management framework built on ADSI
 Home-page: https://github.com/jcarswell/pyad/
 Author: Zakir Durumeric
@@ -17,14 +17,15 @@ 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
+Classifier: Programming Language :: Python :: 3.11
 Obsoletes: pyad
 Requires-Python: >=3.6
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: pywin32
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :align: center

{python-win-ad-0.6.2 → python_win_ad-0.6.3}/pyad/__init__.py

@@ -1,3 +1,7 @@
+# package logger
+import logging
+logging.basicConfig(level=logging.WARNING)
+
 __all__ = [
     "set_defaults",
     "ADQuery",

{python-win-ad-0.6.2 → python_win_ad-0.6.3}/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.info(
+        "Unable to connect to default domain. "
+        "Computer is likely not attached to an AD domain."
     )
     __default_domain_obj = None
     _default_detected_forest = None

{python-win-ad-0.6.2 → python_win_ad-0.6.3}/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 → python_win_ad-0.6.3}/python_win_ad.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-win-ad
-Version: 0.6.2
+Version: 0.6.3
 Summary: An Object-Oriented Active Directory management framework built on ADSI
 Home-page: https://github.com/jcarswell/pyad/
 Author: Zakir Durumeric
@@ -17,14 +17,15 @@ 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
+Classifier: Programming Language :: Python :: 3.11
 Obsoletes: pyad
 Requires-Python: >=3.6
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: pywin32
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :align: center

{python-win-ad-0.6.2 → python_win_ad-0.6.3}/python_win_ad.egg-info/SOURCES.txt

@@ -19,4 +19,6 @@ python_win_ad.egg-info/PKG-INFO
 python_win_ad.egg-info/SOURCES.txt
 python_win_ad.egg-info/dependency_links.txt
 python_win_ad.egg-info/requires.txt
-python_win_ad.egg-info/top_level.txt
+python_win_ad.egg-info/top_level.txt
+tests/tests_adbase.py
+tests/tests_adquery.py

{python-win-ad-0.6.2 → python_win_ad-0.6.3}/setup.py

@@ -12,7 +12,7 @@ def read(fname):
 
 setup(
     name="python-win-ad",
-    version="0.6.2",
+    version="0.6.3",
     author="Zakir Durumeric",
     author_email="zakird@gmail.com",
     maintainer="Josh Carswell",
@@ -38,11 +38,10 @@ setup(
         "Operating System :: Microsoft :: Windows",
         "Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     install_requires=["setuptools", "pywin32"],
 )

python_win_ad-0.6.3/tests/tests_adbase.py

@@ -0,0 +1,22 @@
+from .pyadunittest import ADTestCase
+from pyad.adbase import ADBase
+import pyad
+
+class TestADBase(ADTestCase):
+    def setUp(self):
+        # set all defaults back to their default
+        ADBase.default_ldap_server = None
+        ADBase.default_gc_server = None
+        ADBase.default_ldap_port = None
+        ADBase.default_gc_port = None
+    
+    def test_detected_forest(self):
+        self.assertEqual(ADBase.default_domain, self.SANDBOX_DOMAIN)
+    
+    def test_detected_domain(self):
+        self.assertEqual(ADBase.default_forest, self.SANDBOX_FOREST)
+    
+    def test_set_defaults(self):
+        pyad.set_defaults(ldap_server = self.TEST_DC, ldap_port = 389)
+        self.assertEqual(ADBase.default_ldap_server, self.TEST_DC)
+        self.assertEqual(ADBase.default_ldap_port, 389)

python_win_ad-0.6.3/tests/tests_adquery.py

@@ -0,0 +1,53 @@
+from .pyadunittest import ADTestCase
+import pyad
+
+class TestADQuery(ADTestCase):
+    def setUp(self):
+        self.ad_query = pyad.ADQuery()
+    
+    def test_dne_rowcount(self):
+        query = "cn = '%s'" % self.KNOWN_DNE_OBJECT
+        self.ad_query.execute_query(where_clause = query)
+        self.assertEqual(self.ad_query.row_count, 0)
+
+    def test_dne_single_result(self):
+        query = "cn = '%s'" % self.KNOWN_DNE_OBJECT
+        self.ad_query.execute_query(where_clause = query)
+        self.assertEquals(self.ad_query.get_single_result,{})
+
+    def test_dne_all_results(self):
+        query = "cn = '%s'" % self.KNOWN_DNE_OBJECT
+        self.ad_query.execute_query(where_clause = query)
+        self.assertEqual(self.ad_query.get_all_results(), [])
+
+    def test_single_rowcount(self):
+        query = "cn = '%s'" % self.KNOWN_EXISTS_USER
+        self.ad_query.execute_query(where_clause = query)
+        self.assertEqual(self.ad_query.get_row_count(), 1)
+
+    def test_single_single_result(self):
+        query = "cn = '%s'" % self.KNOWN_EXISTS_USER
+        self.ad_query.execute_query(attributes=("cn","distinguishedname"),where_clause = query)
+        self.assertEqual(self.ad_query.get_single_result()['cn'],self.KNOWN_EXISTS_USER)
+
+    def test_single_all_results(self):
+        query = "cn = '%s'" % self.KNOWN_EXISTS_USER
+        self.ad_query.execute_query(attributes=("cn","distinguishedname"),where_clause = query)
+        self.assertEqual(self.ad_query.get_all_results()[0]['cn'],self.KNOWN_EXISTS_USER)
+
+    def test_multiple_rowcount(self):
+        query = "cn = '%s' or cn = '%s'" % (self.KNOWN_EXISTS_USER, self.KNOWN_EXISTS_COMPUTER)
+        self.ad_query.execute_query(where_clause = query)
+        self.assertEqual(self.ad_query.row_count, 2)
+
+    def test_multiple_single_result(self):
+        query = "cn = '%s' or cn = '%s'" % (self.KNOWN_EXISTS_USER, self.KNOWN_EXISTS_COMPUTER)
+        self.ad_query.execute_query(where_clause = query)
+        self.assertIsInstance(self.ad_query.get_single_result,dict)
+
+    def test_multiple_all_results(self):
+        query = "cn = '%s' or cn = '%s'" % (self.KNOWN_EXISTS_USER, self.KNOWN_EXISTS_COMPUTER)
+        self.ad_query.execute_query(attributes=("cn","distinguishedname"),where_clause = query)
+        r = map(lambda x: x['cn'], self.ad_query.get_all_results())
+        k = [self.KNOWN_EXISTS_USER, self.KNOWN_EXISTS_COMPUTER]
+        self.assertEqual(r.sort(),k.sort())