work in progress on unimacro grammars and bump to 4.1.3

pyproject.toml

@@ -10,10 +10,10 @@ requires-python = ">=3.9"
 readme = "README.md"
 
 
-dependencies = ["dtactions >= 1.5.0",
+dependencies = ["dtactions >= 1.5.6",
         "debugpy >= 1.2.0",
 		"pywin32 >= 304",
-		"natlinkcore >= 5.2.1"]
+		"natlinkcore >= 5.3.5"]
 
 
 classifiers=[	"Development Status :: 4 - Beta",

src/unimacro/UnimacroGrammars/_lines.py

@@ -616,7 +616,7 @@ def convertLineNumberModulo(self, num_as_string):
         if self.currentLine and self.currentLine > 99:
             # modulo trick only when you are above line 100
             intLine = getLineRelativeTo(intLine, self.currentLine, modulo=modulo)
-        print(f'absolute: {intLine}, current: {self.currentLine}, modulo: {modulo}')
+            print(f'absolute: {intLine}, current: {self.currentLine}, modulo: {modulo}')
         return intLine
 
     def fillDefaultInifile(self, ini=None):

src/unimacro/__init__.py

@@ -23,7 +23,7 @@
 import os
 import sys
 
-__version__ = '4.1.0'   
+__version__ = '4.1.3'   
 
 def get_site_packages_dir(fileOfModule):
     """get directory of calling module, if possible in site-packages

src/unimacro/natlinkutilsbj.py

@@ -3036,7 +3036,7 @@ def searchGoBack(self, progInfo=None):
 ##            doc.Range().GoTo(-1,Name="unimacrosearch")
             print('search go back does not work yet')
 
-    def getTopOrChild(self, modInfo=None, childClass=None):
+    def getTopOrChild(self, progInfo=None, childClass=None):
         """return true if top window or child behaves like top
         
         and False if child window or top behaves like child
@@ -3045,12 +3045,12 @@ def getTopOrChild(self, modInfo=None, childClass=None):
         
         """
         #TODO QH this routine sucks
-        if modInfo is None:
-            modInfo = natlink.getCurrentModule()
+        if progInfo is None:
+            progInfo = unimacroutils.getProgInfo()
 
         # ProgInfo = collections.namedtuple('ProgInfo', 'progpath prog title toporchild classname hndle'.split(' '))
 
-        progInfo = unimacroutils.getProgInfo(modInfo=modInfo)
+        progInfo = unimacroutils.getProgInfo()
 
 
         istop = (progInfo.toporchild == 'top')

src/unimacro/unimacro_test/unittestActions.py

@@ -160,7 +160,7 @@ def testKeystroke(self):
     def tttestGetSectionList(self):
         """test with fake program info for sections to be selected
         """
-        progInfo = ("notepad", "title of notepad window", "child", 12345)
+        progInfo = (r'C:\Windows\SysWOW64\notepad.exe', 'notepad', 'Untitled - Notepad', 'child', 'Notepad', 12345)
         sectionsList = actions.getSectionList(progInfo)
         expList = []