isoc-ams 0.1.1__py2.py3-none-any.whl → 0.1.2__py2.py3-none-any.whl

{isoc_ams-0.1.1.dist-info → isoc_ams-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isoc-ams
-Version: 0.1.1
+Version: 0.1.2
 Summary: A Python 3 module to cope with ISOC-AMS.
 Author-email: Klaus Birkenbihl <klaus.birkenbihl@isoc.de>
 Maintainer: Klaus Birkenbihl
@@ -47,9 +47,12 @@ So here we go:
 ### Prerequisites
 isoc-ams was tested under Linux (Ubuntu 22.04) and Windows 11.
 
-Firefox or Chrome Webbrowser with Webdriver (usually included) required.
+**While rather stable under Linux, Windows 11 produced mixed results. Under powershell you may need to set the ExecutionPolicy**
+```
+Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
+```
 
-**Known issue: under Windows the Webdriver for Firefox may produce errors esp. when running headless. No problems encountered using the Chrome Webdriver (see below "Choosing a Webdriver). So on Windows - for now - the default Webdriver is Chrome**
+Firefox or Chrome Webbrowser with Webdriver (usually included) is required.
 
 A full installation of Python 3.9+ is required.
 
@@ -69,7 +72,7 @@ You may select a Webdriver of your choice (provided it is one of "firefox" or "c
 ```bash
 ISOC_AMS_WEBDRIVER=firefox
 ```
-Recommended (and default) is "firefox". Because of Windows problems default on Windows for now is chrome.
+Recommended (and default) is "firefox".
 ### Start execution of the module
 So this happens if we call the module with:
 ```bash
@@ -80,9 +83,9 @@ Output:
 Username:xyz
 Password: 
 
-************************************* 
-2025-07-13 19:25:54 - INFO - START 
-************************************* 
+*********************************************************** 
+2025-07-13 19:25:54 - INFO - START: Webdriver is firefox 
+*********************************************************** 
 
 2025-07-13 19:25:54 - INFO - logging in 
 
@@ -95,9 +98,9 @@ OK, probably your fault. After fixing:
 Username: xxx
 Password: 
 
-************************************* 
-2025-07-13 19:26:27 - INFO - START 
-************************************* 
+*********************************************************** 
+2025-07-13 19:26:27 - INFO - START: Webdriver is firefox 
+*********************************************************** 
 
 2025-07-13 19:26:27 - INFO - logging in 
 2025-07-13 19:26:45 - INFO - Now on Chapter Leader portal 
@@ -152,9 +155,9 @@ Output:
 Username: xxx
 Password: 
 
-******************************************** 
-2025-07-15 10:35:57 - INFO - START DRYRUN 
-******************************************** 
+****************************************************************** 
+2025-07-15 10:35:57 - INFO - START DRYRUN: Webdriver is firefox 
+*****************************************************************
 
 2025-07-15 10:35:57 - INFO - logging in 
 2025-07-15 10:36:12 - INFO - Now on Chapter Leader portal 
@@ -211,9 +214,9 @@ isoc_ams unleashes its full power when used as API to make things happen without
 Here the output:
 ```
 
-************************************* 
-2025-07-15 14:13:36 - INFO - START 
-************************************* 
+*********************************************************** 
+2025-07-15 14:13:30 - INFO - START: Webdriver is firefox 
+*********************************************************** 
 
 2025-07-15 14:13:36 - INFO - logging in 
 2025-07-15 14:13:53 - INFO - Now on Chapter Leader portal 

isoc_ams-0.1.2.dist-info/RECORD

@@ -0,0 +1,5 @@
+isoc_ams.py,sha256=jrlY2qFp4adJRc7JDv2QlyQE4SXb70WEm-WSkE6lXVI,38023
+isoc_ams-0.1.2.dist-info/licenses/LICENSE,sha256=BJcMew_kvBWHjs-_Hd_OMHnxOLmeczeT88V4gFCT21U,1067
+isoc_ams-0.1.2.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+isoc_ams-0.1.2.dist-info/METADATA,sha256=VOOwPNqW_i7782x0gRCuZ5xxXjs7lkZ1b-IYl6YODNQ,11658
+isoc_ams-0.1.2.dist-info/RECORD,,

isoc_ams.py

@@ -87,8 +87,10 @@ CHANGELOG
         minor bug fixes
     Version 0.1.1
         minor bug fixes
+    Version 0.1.2
+        eliminate not required checks in difference_from_expected()
 """
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 
 from selenium import webdriver
 from selenium.webdriver.common.by import By
@@ -234,13 +236,13 @@ ARGUMENTS
         _init_logging(logfile, debuglog)
         self._ams = _ISOC_AMS()
         if self._dryrun:
-            strong_msg("START DRYRUN:", "Webdriver is", _dr)
+            strong_msg("START DRYRUN:", "Version:", __version__, "Webdriver is", _dr)
         else:
-            strong_msg("START:", "Webdriver is", _dr)
+            strong_msg("START:", "Version:", __version__, "Webdriver is", _dr)
         self._ams.login((user, password))
         self._members_list = self._ams.build_members_list()
         self._pending_applications_list = self._ams.build_pending_applicants_list()
-
+        self.approve_list = self.delete_list = self.deny_list = None
 
     @property
     def members_list(self) -> dict:
@@ -300,6 +302,7 @@ ARGUMENTS
         """
         if type(delete_list) in (str, int):
             delete_list = [delete_list]
+        self.delete_list = delete_list
         for deletee in map(str, delete_list):
             if deletee in self._members_list:
                 deletee = str(deletee)
@@ -327,6 +330,7 @@ ARGUMENTS
         """
         if type(approve_list) in (int, str):
             approve_list = [approve_list]
+        self.approve_list = approve_list
         for approvee in map(str, approve_list):
             if approvee in self._pending_applications_list:
                 if approvee not in self._members_list:
@@ -360,6 +364,7 @@ ARGUMENTS
         """
         if type(deny_list) in (str, int):
             deny_list = [deny_list],
+        self.deny_list = deny_list
         for denyee in map(str, deny_list):
             if denyee in self._pending_applications_list:
                 if not self._dryrun:
@@ -406,29 +411,36 @@ RETURNS
             not_deleted = {}
             not_approved = {}
             not_removed_from_pending = {}
-            new_members_list = self._ams.build_members_list()
+
+            if self.approve_list or self.delete_list:
+                new_members_list = self._ams.build_members_list()
+            if self.deny_list or self.approve_list:
+                new_pending_applications_list = self._ams.build_pending_applicants_list()
+
             dlog("Check members list")
-            for nm in new_members_list:
-                if nm not in self._members_list:
-                    dlog(new_members_list[nm]["first name"],
-                         new_members_list[nm]["last name"],
-                         "("+nm+")",
-                         "was not deleted")
-                    not_deleted[nm] = new_members_list[nm]
-            for nm in self._members_list:
-                if nm not in new_members_list:
-                    dlog(self._members_list[nm]["first name"],
-                         self._members_list[nm]["last name"],
-                         "("+nm+")",
-                         "was not approved")
-                    not_approved[nm] = self._members_list[nm]
-            new_pending_applications_list = self._ams.build_pending_applicants_list()
-            for np in new_pending_applications_list:
-                if np not in self._pending_applications_list:
-                    dlog(self._members_list[nm]["name"],
-                         "("+nm+")",
-                         "was not removed from pending aoolications")
-                    not_removed_from_pending[np] = new_pending_applications_list[np]
+            if self.delete_list:
+                for nm in new_members_list:
+                    if nm not in self._members_list:
+                        dlog(new_members_list[nm]["first name"],
+                             new_members_list[nm]["last name"],
+                             "("+nm+")",
+                             "was not deleted")
+                        not_deleted[nm] = new_members_list[nm]
+            if self.approve_list:
+                for nm in self._members_list:
+                    if nm not in new_members_list:
+                        dlog(self._members_list[nm]["first name"],
+                             self._members_list[nm]["last name"],
+                             "("+nm+")",
+                             "was not approved")
+                        not_approved[nm] = self._members_list[nm]
+            if self.deny_list:
+                for np in new_pending_applications_list:
+                    if np not in self._pending_applications_list:
+                        dlog(self._members_list[nm]["name"],
+                             "("+nm+")",
+                             "was not removed from pending aoolications")
+                        not_removed_from_pending[np] = new_pending_applications_list[np]
 
             result = {}
             if not_deleted:
@@ -946,7 +958,7 @@ if __name__ == "__main__":
             headless=headless,
             dryrun=dryrun,
             logfile=sys.stdout,
-            debuglog=NoneHh,
+            debuglog=None,
             )
     else:
         ams = ISOC_AMS(

isoc_ams-0.1.1.dist-info/RECORD

@@ -1,5 +0,0 @@
-isoc_ams.py,sha256=yCn-97ofCPsX7Ceh3I_eK9nVXNI96Tcvpb6YNPpHLQU,37412
-isoc_ams-0.1.1.dist-info/licenses/LICENSE,sha256=BJcMew_kvBWHjs-_Hd_OMHnxOLmeczeT88V4gFCT21U,1067
-isoc_ams-0.1.1.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-isoc_ams-0.1.1.dist-info/METADATA,sha256=yRQKS5IHCMJRVG_n0LSRcRKoFq4yx2n51aQRuYpdb9Y,11501
-isoc_ams-0.1.1.dist-info/RECORD,,