xlwings-utils 25.0.7.post0__tar.gz → 25.0.7.post1__tar.gz

{xlwings_utils-25.0.7.post0 → xlwings_utils-25.0.7.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xlwings_utils
-Version: 25.0.7.post0
+Version: 25.0.7.post1
 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.7.post0 → xlwings_utils-25.0.7.post1}/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.7.post0"
+version = "25.0.7.post1"
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [

{xlwings_utils-25.0.7.post0 → xlwings_utils-25.0.7.post1}/tests/test_xlwings_utils.py

@@ -79,7 +79,20 @@ def test_block_scalar():
     this_block = xwu.block.from_value(1)
     assert this_block.value == [[1]]
 
-
+def test_transpose():
+    this_block = xwu.block.from_value([[1, 2, 3], [4, 5, 6]])
+    transposed_block=this_block.transposed()
+    assert transposed_block.value==[[1,4],[2,5],[3,6]]
+
+def test_delete_none():
+    this_block = xwu.block.from_value([[1, 2, None], [4, 5, None]])
+    assert len(this_block.dict)==4
+    this_block[1,1]=None
+    assert len(this_block.dict)==3    
+    this_block[1,1]=None
+    assert len(this_block.dict)==3 
+    assert this_block.value==[[None, 2, None], [4, 5, None]]
+    
 def test_raise():
     this_block = xwu.block(number_of_rows=4, number_of_columns=6)
     with pytest.raises(IndexError):

{xlwings_utils-25.0.7.post0 → xlwings_utils-25.0.7.post1}/xlwings_utils/xlwings_utils.py

@@ -290,6 +290,11 @@ class block:
         self.number_of_rows = number_of_rows
         self.number_of_columns = number_of_columns
 
+    def __eq__(self,other):
+        if isinstance(other, block):
+            return self.value == other.value
+        return False
+
     @classmethod
     def from_value(cls, value, column_like=False):
         """
@@ -297,18 +302,12 @@ class block:
 
         Parameters
         ----------
-        value : scaler, list of scalars, list of lists of scalars or block
+        value : scalar, list of scalars, list of lists of scalars or block
             value to be used in block, possibly expanded to a list of lists of scalars
 
         column_like : boolean
             if value is a list of scalars, values is interpreted as a column if True, as a row otherwise
 
-        number_of_rows : int
-            if given, expand or shrink to the given number of rows
-
-        number_of_columns : int
-            if given, expand or shrink to the given number of columns
-
         Returns
         -------
         block : block
@@ -328,7 +327,7 @@ class block:
             for column, item in enumerate(row_contents, 1):
                 if item and not (isinstance(item, float) and math.isnan(item)):
                     bl.dict[row, column] = item
-                    bl._number_of_columns = max(bl.number_of_columns, column)
+                bl._number_of_columns = max(bl.number_of_columns, column)
         return bl
 
     @classmethod
@@ -341,19 +340,12 @@ class block:
         rng : xlwings.Range
             range to be used be used in block
 
-        number_of_rows : int
-            if given, expand or shrink to the given number of rows
-
-        number_of_columns : int
-            if given, expand or shrink to the given number of columns
-
         Returns
         -------
         block : block
         """
         number_of_rows, number_of_columns = rng.shape
-        bl = cls.from_value(rng.value, column_like=(number_of_columns == 1))
-        return bl
+        return cls.from_value(rng.value, column_like=(number_of_columns == 1))
 
     @classmethod
     def from_xlrd_sheet(cls, sheet):
@@ -365,12 +357,6 @@ class block:
         sheet : xlrd sheet
             sheet to be used be used in block
 
-        number_of_rows : int
-            if given, expand or shrink to the given number of rows
-
-        number_of_columns : int
-            if given, expand or shrink to the given number of columns
-
         Returns
         -------
         block : block
@@ -380,6 +366,18 @@ class block:
 
     @classmethod
     def from_openpyxl_sheet(cls, sheet):
+        """
+        makes a block from an openpyxl sheet
+
+        Parameters
+        ----------
+        sheet : xlrd sheet
+            sheet to be used be used in block
+
+        Returns
+        -------
+        block : block
+        """
         v = [[cell.value for cell in row] for row in sheet.iter_rows()]
         return cls.from_value(v)
 
@@ -393,12 +391,6 @@ class block:
         filename : str
             file to be used be used in block
 
-        number_of_rows : int
-            if given, expand or shrink to the given number of rows
-
-        number_of_columns : int
-            if given, expand or shrink to the given number of columns
-
         Returns
         -------
         block : block
@@ -417,12 +409,6 @@ class block:
         df : pandas dataframe
             dataframe to be used be used in block
 
-        number_of_rows : int
-            if given, expand or shrink to the given number of rows
-
-        number_of_columns : int
-            if given, expand or shrink to the given number of columns
-
         Returns
         -------
         block : block
@@ -432,18 +418,12 @@ class block:
 
     def to_openpyxl_sheet(self, sheet):
         """
-        makes a block from a given openpyxl sheet
+        appends a block to a given openpyxl sheet
 
         Parameters
         ----------
         sheet: openpyxl sheet
-            sheet to be used be used in block
-
-        number_of_rows : int
-            if given, expand or shrink to the given number of rows
-
-        number_of_columns : int
-            if given, expand or shrink to the given number of columns
+            sheet to be used be used
 
         Returns
         -------
@@ -488,7 +468,11 @@ class block:
             raise IndexError(f"row must be between 1 and {self.number_of_rows} not {row}")
         if column < 1 or column > self.number_of_columns:
             raise IndexError(f"column must be between 1 and {self.number_of_columns} not {column}")
-        self.dict[row, column] = value
+        if value is None:
+            if (row,column) in self.dict:
+                del self.dict[row,column]
+        else:
+            self.dict[row, column] = value
 
     def __getitem__(self, row_column):
         row, column = row_column
@@ -562,7 +546,7 @@ class block:
         if column > self.number_of_columns:
             raise ValueError(f"{name}={column} > number_of_columns={self.number_of_columns}")
 
-    def transpose(self):
+    def transposed(self):
         """
         transpose block
 
@@ -827,7 +811,16 @@ class block:
 
     def decode_to_files(self):
         """
-        decode the block with encoded file(s) to individual pyoidide files
+        decode the block with encoded file(s) to individual pyoidide file(s)
+        
+        Returns
+        -------
+        count : int
+            number of files decoded
+        
+        Note
+        ----
+        if the block does not contain an encode file, the method just returns 0
         """
         count = 0
         for column in range(1, self.number_of_columns + 1):

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

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