xlwings-utils 25.0.0__tar.gz → 25.0.0.post0__tar.gz

{xlwings_utils-25.0.0 → xlwings_utils-25.0.0.post0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xlwings_utils
-Version: 25.0.0
+Version: 25.0.0.post0
 Summary: xlwings_utils
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/xlwings_utils

{xlwings_utils-25.0.0 → xlwings_utils-25.0.0.post0}/pyproject.toml

@@ -10,7 +10,7 @@ authors = [
     { name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com" },
 ]
 description = "xlwings_utils"
-version = "25.0.0"
+version = "25.0.0.post0"
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [

{xlwings_utils-25.0.0 → xlwings_utils-25.0.0.post0}/tests/test_xlwings_utils.py

@@ -102,6 +102,44 @@ def test_raise():
     with pytest.raises(IndexError):
         this_block[1, 7] = 1
 
+def test_lookup():
+    bl=xwu.block([[1,"One", "Un"],[2, "Two", "Deux"],[3,"Three","Trois"]])
+    assert bl.lookup(1)=="One"
+    assert bl.lookup(3, column2=3)=="Trois"
+    with pytest.raises(ValueError):
+        bl.lookup(4)
+    with pytest.raises(ValueError):
+        bl.lookup(1, column1=4)
+    with pytest.raises(ValueError):
+        bl.lookup(1, column1=3)
+    assert bl.lookup_row(1)==1
+    assert bl.lookup_row(3)==3
+
+def test_vookup():
+    bl=xwu.block([[1,"One", "Un"],[2, "Two", "Deux"],[3,"Three","Trois"]])
+    assert bl.vlookup(1)=="One"
+    assert bl.vlookup(3, column2=3)=="Trois"
+    with pytest.raises(ValueError):
+        bl.vlookup(4)
+    with pytest.raises(ValueError):
+        bl.vlookup(1, column1=4)
+    with pytest.raises(ValueError):
+        bl.vlookup(1, column1=3)
+
+def test_hlookup():
+    bl=xwu.block([[1,2,3],"One Two Three".split(), "Un Deux Trois".split()])
+                 
+    assert bl.hlookup(1)=="One"
+    assert bl.hlookup(3, row2=3)=="Trois"
+    with pytest.raises(ValueError):
+        bl.hlookup(4)
+    with pytest.raises(ValueError):
+        bl.hlookup(1, row1=4)
+    with pytest.raises(ValueError):
+        bl.hlookup(1, row1=3)
+    assert bl.lookup_column(1)==1
+    assert bl.lookup_column(3)==3
+
 
 def test_capture(capsys):
     print("abc")

{xlwings_utils-25.0.0 → xlwings_utils-25.0.0.post0}/xlwings_utils/xlwings_utils.py

@@ -372,6 +372,58 @@ class block:
     def __repr__(self):
         return f"block({self.value})"
 
+    def _check_row(self, row, name):
+        if row < 1:
+            raise ValueError(f"{name}={row} < 1")
+        if row > self.number_of_rows:
+            raise ValueError(f"{name}={row} > number_of_rows={self.number_of_rows}")
+
+    def _check_column(self, column, name):
+        if column < 1:
+            raise ValueError(f"{name}={column} < 1")
+        if column > self.number_of_columns:
+            raise ValueError(f"{name}={column} > number_of_columns={self.number_of_columns}")
+
+    def vlookup(self, s, *, row_from=1, row_to=None, column1=1, column2=None):
+        if column2 is None:
+            column2 = column1 + 1
+        self._check_column(column2, "column2")
+        row = self.lookup_row(s, row_from=row_from, row_to=row_to, column1=column1)
+        return self[row, column2]
+
+    def lookup_row(self, s, *, row_from=1, row_to=None, column1=1):
+        if row_to is None:
+            row_to = self.highest_used_row_number
+        self._check_row(row_from, "row_from")
+        self._check_row(row_to, "row_to")
+        self._check_column(column1, "column1")
+
+        for row in range(row_from, row_to + 1):
+            if self[row, column1] == s:
+                return row
+        raise ValueError(f"{s} not found")
+
+    def hlookup(self, s, *, column_from=1, column_to=None, row1=1, row2=None):
+        if row2 is None:
+            row2 = row1 + 1
+        self._check_row(row2, "row2")
+        column = self.lookup_column(s, column_from=column_from, column_to=column_to, row1=row1)
+        return self[row2, column]
+
+    def lookup_column(self, s, *, column_from=1, column_to=None, row1=1):
+        if column_to is None:
+            column_to = self.highest_used_column_number
+        self._check_column(column_from, "column_from")
+        self._check_column(column_to, "column_to")
+        self._check_row(row1, "row1")
+
+        for column in range(column_from, column_to + 1):
+            if self[row1, column] == s:
+                return column
+        raise ValueError(f"{s} not found")
+
+    def lookup(self, s, *, row_from=1, row_to=None, column1=1, column2=None):
+        return self.vlookup(s, row_from=row_from, row_to=row_to, column1=column1, column2=column2)
 
 
 class _capture:
@@ -396,7 +448,7 @@ class _capture:
     def __init__(self):
         self.stdout = sys.stdout
         self._include_print = False
-        self._buffer=[]
+        self._buffer = []
 
     def __enter__(self):
         sys.stdout = self
@@ -413,50 +465,47 @@ class _capture:
         if self._include_print:
             self.stdout.flush()
         self._buffer.append("\n")
-        
 
     @property
     def value(self):
-        result=self.value_keep
+        result = self.value_keep
         self.clear()
         return result
-        
-        
+
     @property
     def value_keep(self):
-        result= [[line] for line in self.str_keep.splitlines()]
+        result = [[line] for line in self.str_keep.splitlines()]
         return result
-        
+
     @property
     def str(self):
         result = self.str_keep
         self._buffer.clear()
-        return result        
-        
+        return result
+
     @property
     def str_keep(self):
         result = "".join(self._buffer)
-        return result        
-        
+        return result
+
     def clear(self):
         self._buffer.clear()
-        
-        
+
     @property
     def include_print(self):
         return self._include_print
-        
+
     @include_print.setter
     def include_print(self, value):
-        self._include_print=value
-        
+        self._include_print = value
 
 
 def reset():
-    capture.include_print=False
+    capture.include_print = False
     capture.clear()
-    
-capture=_capture()
+
+
+capture = _capture()
 
 
 if __name__ == "__main__":

{xlwings_utils-25.0.0 → xlwings_utils-25.0.0.post0}/xlwings_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xlwings_utils
-Version: 25.0.0
+Version: 25.0.0.post0
 Summary: xlwings_utils
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/xlwings_utils