quickinteg 2.5.0__tar.gz → 2.8.0__tar.gz

{quickinteg-2.5.0/quickinteg.egg-info → quickinteg-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quickinteg
-Version: 2.5.0
+Version: 2.8.0
 Summary: Scripts QGIS Processing pour l'intégration rapide des données.
 Author: Valérian LEBERT
 License: GPL-3.0-or-later

{quickinteg-2.5.0 → quickinteg-2.8.0}/pyproject.toml

@@ -56,12 +56,12 @@ quickinteg = ["external/**/*"]
 
 # --- Ruff (remplace black, flake8, isort) ---
 [tool.ruff]
-line-length = 100
+line-length = 160
 target-version = "py39"
 
 [tool.ruff.lint]
 select = ["E", "F", "I", "UP"]
-ignore = []
+ignore = ["UP031", "UP022", "E722", "E402"]
 
 # --- Basedpyright (type checking) ---
 [tool.basedpyright]

{quickinteg-2.5.0 → quickinteg-2.8.0}/quickinteg/__about__.py

@@ -28,7 +28,5 @@ __title__ = "QuickInteg"
 __title_clean__ = "".join(e for e in __title__ if e.isalnum())
 __uri__ = "https://gitlab.com/vlebert/quickinteg/"
 
-__version__ = "2.5.0"
-__version_info__ = tuple(
-    [int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split(".")]
-)
+__version__ = "2.8.0"
+__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split(".")])

{quickinteg-2.5.0 → quickinteg-2.8.0}/quickinteg/cli.py

@@ -53,7 +53,7 @@ def quickinteg_import():
     Alias : qi-import
     """
     parser = argparse.ArgumentParser()
-    parser.add_argument("source", help="Chemin vers le repertoir à intégrer")
+    parser.add_argument("source", help="Chemin vers le dossier à intégrer ou fichier GPKG")
     parser.add_argument("-c", "--no-csv", help="Exclure les fichiers CSV", action="store_true")
     parser.add_argument(
         "-d",
@@ -74,23 +74,41 @@ def quickinteg_import():
         help="Mode récursif (parcours les sous-dossiers).",
         action="store_true",
     )
+
     args = parser.parse_args()
     processing_logging.add_console_handler(logging.getLogger(""))
 
+    # Auto-detect if source is a GPKG file or folder
+    source_path = Path(args.source)
+    is_gpkg = source_path.suffix.lower() == ".gpkg"
+
     if args.destination:
         log_file = Path(args.destination).parent / "log_integ.txt"
+    elif is_gpkg:
+        log_file = Path(args.source).parent / "log_integ.txt"
     else:
         log_file = Path(args.source) / "log_integ.txt"
     processing_logging.add_file_handler(logging.getLogger(""), log_file, logging.DEBUG)
 
-    spatialiteio.import_folder_to_spl(
-        args.source,
-        ogr_target=args.destination,
-        prefix=args.prefix,
-        include_csv=(not args.no_csv),
-        ignore_grace_list=True,
-        recursive=args.recursive,
-    )
+    if is_gpkg:
+        # Direct GPKG import
+        processing_logging.log("Import direct d'un fichier GPKG", logging.getLogger(""), "info")
+        spatialiteio.import_gpkg_to_spl(
+            args.source,
+            ogr_target=args.destination,
+            prefix=args.prefix,
+            ignore_grace_list=True,
+        )
+    else:
+        # Folder import (which can also contain GPKG files)
+        spatialiteio.import_folder_to_spl(
+            args.source,
+            ogr_target=args.destination,
+            prefix=args.prefix,
+            include_csv=(not args.no_csv),
+            ignore_grace_list=True,
+            recursive=args.recursive,
+        )
     if args.export:
         spatialiteio.export_preset_tables(args.destination)
 
@@ -101,9 +119,7 @@ def quickinteg_rop():
     """
     parser = argparse.ArgumentParser()
     parser.add_argument("db_file", help="Base de donnée Quickinteg")
-    parser.add_argument(
-        "-v", "--version", help="Version GRACE THD (2 ou 3, 3 par défaut)", default=3
-    )
+    parser.add_argument("-v", "--version", help="Version GRACE THD (2 ou 3, 3 par défaut)", default=3)
     parser.add_argument(
         "-m",
         "--mode",

{quickinteg-2.5.0 → quickinteg-2.8.0}/quickinteg/excel_shortcut.py

@@ -26,9 +26,9 @@ import logging
 
 # 3rd party - try embedded first (for QGIS), fallback to normal import (for CLI)
 try:
-    from .external import openpyxl
+    from .external import openpyxl  # type: ignore
 except ImportError:
-    import openpyxl
+    import openpyxl  # type: ignore
 
 # package
 from . import processing_logging
@@ -56,9 +56,7 @@ def log(message: str, logLevel: str = "info"):
     processing_logging.log(message, module_logger, logLevel)
 
 
-def read_sheet_to_dict(
-    excel_file_path, list_necessary_columns, primary_key=None, excel_sheet_name=None
-):
+def read_sheet_to_dict(excel_file_path, list_necessary_columns, primary_key=None, excel_sheet_name=None):
     """
     Lecture d'un fichier excel vert un dict de dict.
     Chaque ligne est un dict avec comme clés les en-têtes de colones.
@@ -90,6 +88,9 @@ def read_sheet_to_dict(
     wb = openpyxl.load_workbook(excel_file_path, data_only=True)
     sheet = wb[excel_sheet_name] if excel_sheet_name else wb.active
 
+    if sheet is None:
+        raise ValueError("No active sheet found in the Excel workbook")
+
     rows = sheet.iter_rows(values_only=True)
     headers = next(rows)  # Get the first row with column names
     header_set = set(headers)
@@ -97,9 +98,7 @@ def read_sheet_to_dict(
     necessary_columns_set = set(list_necessary_columns)
     if not necessary_columns_set.issubset(header_set):
         missing_columns = necessary_columns_set - header_set
-        raise ValueError(
-            f"The necessary columns {missing_columns} were not found in the Excel sheet"
-        )
+        raise ValueError(f"The necessary columns {missing_columns} were not found in the Excel sheet")
 
     header_index = {header: headers.index(header) for header in list_necessary_columns}
 

quickinteg-2.8.0/quickinteg/external/XlsxWriter-3.1.9.dist-info/INSTALLER

@@ -0,0 +1 @@
+uv

quickinteg-2.8.0/quickinteg/external/XlsxWriter-3.1.9.dist-info/LICENSE.txt

@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2013-2023, John McNamara <jmcnamara@cpan.org>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

quickinteg-2.8.0/quickinteg/external/XlsxWriter-3.1.9.dist-info/METADATA

@@ -0,0 +1,89 @@
+Metadata-Version: 2.1
+Name: XlsxWriter
+Version: 3.1.9
+Summary: A Python module for creating Excel XLSX files.
+Home-page: https://github.com/jmcnamara/XlsxWriter
+Author: John McNamara
+Author-email: jmcnamara@cpan.org
+License: BSD-2-Clause
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+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
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.6
+License-File: LICENSE.txt
+
+XlsxWriter
+==========
+
+**XlsxWriter** is a Python module for writing files in the Excel 2007+ XLSX
+file format.
+
+XlsxWriter can be used to write text, numbers, formulas and hyperlinks to
+multiple worksheets and it supports features such as formatting and many more,
+including:
+
+* 100% compatible Excel XLSX files.
+* Full formatting.
+* Merged cells.
+* Defined names.
+* Charts.
+* Autofilters.
+* Data validation and drop down lists.
+* Conditional formatting.
+* Worksheet PNG/JPEG/GIF/BMP/WMF/EMF images.
+* Rich multi-format strings.
+* Cell comments.
+* Integration with Pandas and Polars.
+* Textboxes.
+* Support for adding Macros.
+* Memory optimization mode for writing large files.
+
+It supports Python 3.4+ and PyPy3 and uses standard libraries only.
+
+Here is a simple example:
+
+.. code-block:: python
+
+   import xlsxwriter
+
+
+   # Create an new Excel file and add a worksheet.
+   workbook = xlsxwriter.Workbook('demo.xlsx')
+   worksheet = workbook.add_worksheet()
+
+   # Widen the first column to make the text clearer.
+   worksheet.set_column('A:A', 20)
+
+   # Add a bold format to use to highlight cells.
+   bold = workbook.add_format({'bold': True})
+
+   # Write some simple text.
+   worksheet.write('A1', 'Hello')
+
+   # Text with formatting.
+   worksheet.write('A2', 'World', bold)
+
+   # Write some numbers, with row/column notation.
+   worksheet.write(2, 0, 123)
+   worksheet.write(3, 0, 123.456)
+
+   # Insert an image.
+   worksheet.insert_image('B5', 'logo.png')
+
+   workbook.close()
+
+.. image:: https://raw.github.com/jmcnamara/XlsxWriter/master/dev/docs/source/_images/demo.png
+
+See the full documentation at: https://xlsxwriter.readthedocs.io
+
+Release notes: https://xlsxwriter.readthedocs.io/changes.html
+

quickinteg-2.8.0/quickinteg/external/XlsxWriter-3.1.9.dist-info/RECORD

@@ -0,0 +1,41 @@
+XlsxWriter-3.1.9.dist-info/INSTALLER,sha256=5hhM4Q4mYTT9z6QB6PGpUAW81PGNFrYrdXMj4oM_6ak,2
+XlsxWriter-3.1.9.dist-info/LICENSE.txt,sha256=s7SUx-dFba0SrBs-YcYOhQ1g086GX6BWxM4K5oDANnc,1349
+XlsxWriter-3.1.9.dist-info/METADATA,sha256=G4jA0at0iwYM-mYfTCGrJauIckhzZyfjCohiqnZsyjw,2605
+XlsxWriter-3.1.9.dist-info/RECORD,,
+XlsxWriter-3.1.9.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+XlsxWriter-3.1.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+XlsxWriter-3.1.9.dist-info/top_level.txt,sha256=xFEUcpcY7QzAr_-ztkXebEt1FZCxpuCbmyCsBaevhRk,11
+bin/vba_extract.py,sha256=8T2-KE4ybgM5FRIT3DAqpLUsnp09_lpTI2H6izwL6UI,2363
+xlsxwriter/__init__.py,sha256=XY1Ui-gKJHKbrOCvEM3Tasme1ypd2fLNTliBS94fhoM,188
+xlsxwriter/app.py,sha256=IyZO4nAFO5DgYdOKgyGkqTgA8_E1DCyEUdcnNn9ruhw,5823
+xlsxwriter/chart.py,sha256=1OsUMYpNWTXAWs0RLdgcQWsR8njqCw2Gwna5AQEzHu4,129910
+xlsxwriter/chart_area.py,sha256=UfbG_WCQMZuUtMz-0IWoZbjyyr78A5zfB05keo01OGs,2676
+xlsxwriter/chart_bar.py,sha256=QLJDAZRLN90FttiwDspq2Bav8JsmvTUl-YqYKFctFcw,4828
+xlsxwriter/chart_column.py,sha256=WtwgL67_5-eGymVGY8BS9oGwf9NfxL3sgR5nUIr3HIc,3579
+xlsxwriter/chart_doughnut.py,sha256=mF2VSJd-kEJWBvCGWpNJcGNxTwOlA_0ebGdco6_mM9Y,2690
+xlsxwriter/chart_line.py,sha256=nwH5SO15bPMiHXYAYR0r89kRhHbtqlZNfTgBjjeKIoU,3757
+xlsxwriter/chart_pie.py,sha256=5G2cidb2TjxWBkw0GvqjLQx0ckXkibQOZX-sLFr1Xe4,7402
+xlsxwriter/chart_radar.py,sha256=pDCA4UMNqDMv1osNjS1Fxkn8y64cADf5p4QRuteYAhI,2739
+xlsxwriter/chart_scatter.py,sha256=2PEoXQb4saXg0EGhLqiKr7Ywx5AE9Y5IXENZWjDGV0A,9488
+xlsxwriter/chart_stock.py,sha256=DEfp3z6tgPgN8sxQZT9tCnRoWWXhx7lFcJN1tRDEBPI,3524
+xlsxwriter/chartsheet.py,sha256=U9uLjqWwnVet5FXc2C3Vh5K1t9giUOi9XGHnhF-EXUc,5468
+xlsxwriter/comments.py,sha256=5TDtd1Lna6b73VaOXxe5-aaBherzq3NlzaY7Fnc2LB0,5598
+xlsxwriter/contenttypes.py,sha256=uQPBUkJ10M8AYeo2Onsxk24pERIln6kHRT8ZFsqFWso,7559
+xlsxwriter/core.py,sha256=oBlObKPWQm6tCqmRMXulUIrAfmK8daUMJjPXuP-FOks,5693
+xlsxwriter/custom.py,sha256=kKZeN_fCWXzhaTJTPNm4TshkPsRd0EPwNFt8uaKrP4I,3829
+xlsxwriter/drawing.py,sha256=cZowp8iisUW_TeYAl8he7KYYMd3lWl1DGQPWJiGbv7Y,35058
+xlsxwriter/exceptions.py,sha256=0ajRMYlTlqKZwXz8oIkV02Ho1SpQsQWX4XNghxdT_Kk,1394
+xlsxwriter/format.py,sha256=o3Bd8RtQm00OvuQdTOCnOljk_gzxuXcNCzV9dIyvwyo,26767
+xlsxwriter/metadata.py,sha256=VEZzY6SrKMVG2--9sBIWZ8_Qu-aX1XoTVGyaYtVw4_I,4522
+xlsxwriter/packager.py,sha256=GIttn1Yu0hK9f_N3hRZOC1vEnwKBrvGXUkY8c_ZU5n8,25872
+xlsxwriter/relationships.py,sha256=epB-fg5_3XOddV9NMGdf4Ydvy1DdfgcEcaiqeKRKQ_8,3274
+xlsxwriter/shape.py,sha256=JmTBe1OGY4OwTgm7cGpI-9K0AXA2zSZjaQT2zilenls,12830
+xlsxwriter/sharedstrings.py,sha256=ja61sulwo_FYl6_1QwtM0Hk6PZ1NYzAxbxiStnnSuxo,4731
+xlsxwriter/styles.py,sha256=c3CZ56BztLYLprdBFDLMpnWO2WpP3Ka3kilUO5dA_7c,23162
+xlsxwriter/table.py,sha256=bJDGlAdtrxMIIA98BEAlkRipfvYB9xpp0ZaF007WEJQ,5843
+xlsxwriter/theme.py,sha256=PE22WMb6y1QXu9rE9fDv-ay8PYOLxO_tmGPHsUuHrc4,8844
+xlsxwriter/utility.py,sha256=w4QF9QyBfmAPrhpbBgdB4JRgJFBWpRbivkQ_Tgpu3Iw,28447
+xlsxwriter/vml.py,sha256=Rf-dhI1hkRuOLP0aQs0KWWMU2MWUtRMgoiX82J-qJ1g,19651
+xlsxwriter/workbook.py,sha256=0Of1rPZI_TQoKKjVu6806dtS3kNEuqxjLKz4uaPOqgM,65911
+xlsxwriter/worksheet.py,sha256=Gn-uHJ-kbgxvmWIeYyc1RN7apFDEyqfGjJ8mvP6GEt8,285655
+xlsxwriter/xmlwriter.py,sha256=wuxTQAIKuLY-XpPzDRiDRGeLY6GUxIti-igfbMwm74w,6723

quickinteg-2.8.0/quickinteg/external/XlsxWriter-3.1.9.dist-info/WHEEL

@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: bdist_wheel (0.41.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+

quickinteg-2.8.0/quickinteg/external/XlsxWriter-3.1.9.dist-info/top_level.txt

@@ -0,0 +1 @@
+xlsxwriter

quickinteg-2.8.0/quickinteg/external/bin/vba_extract.py

@@ -0,0 +1,78 @@
+#!/Users/vlebert/Python/quickinteg/.venv/bin/python3
+
+##############################################################################
+#
+# vba_extract - A simple utility to extract a vbaProject.bin binary from an
+# Excel 2007+ xlsm file for insertion into an XlsxWriter file.
+#
+# SPDX-License-Identifier: BSD-2-Clause
+# Copyright 2013-2023, John McNamara, jmcnamara@cpan.org
+#
+import sys
+from zipfile import ZipFile
+from zipfile import BadZipFile
+
+
+def extract_file(xlsm_zip, filename):
+    # Extract a single file from an Excel xlsm macro file.
+    data = xlsm_zip.read("xl/" + filename)
+
+    # Write the data to a local file.
+    file = open(filename, "wb")
+    file.write(data)
+    file.close()
+
+
+# The VBA project file and project signature file we want to extract.
+vba_filename = "vbaProject.bin"
+vba_signature_filename = "vbaProjectSignature.bin"
+
+# Get the xlsm file name from the commandline.
+if len(sys.argv) > 1:
+    xlsm_file = sys.argv[1]
+else:
+    print(
+        "\nUtility to extract a vbaProject.bin binary from an Excel 2007+ "
+        "xlsm macro file for insertion into an XlsxWriter file.\n"
+        "If the macros are digitally signed, extracts also a vbaProjectSignature.bin "
+        "file.\n"
+        "\n"
+        "See: https://xlsxwriter.readthedocs.io/working_with_macros.html\n"
+        "\n"
+        "Usage: vba_extract file.xlsm\n"
+    )
+    exit()
+
+try:
+    # Open the Excel xlsm file as a zip file.
+    xlsm_zip = ZipFile(xlsm_file, "r")
+
+    # Read the xl/vbaProject.bin file.
+    extract_file(xlsm_zip, vba_filename)
+    print("Extracted: %s" % vba_filename)
+
+    if "xl/" + vba_signature_filename in xlsm_zip.namelist():
+        extract_file(xlsm_zip, vba_signature_filename)
+        print("Extracted: %s" % vba_signature_filename)
+
+
+except IOError as e:
+    print("File error: %s" % str(e))
+    exit()
+
+except KeyError as e:
+    # Usually when there isn't a xl/vbaProject.bin member in the file.
+    print("File error: %s" % str(e))
+    print("File may not be an Excel xlsm macro file: '%s'" % xlsm_file)
+    exit()
+
+except BadZipFile as e:
+    # Usually if the file is an xls file and not an xlsm file.
+    print("File error: %s: '%s'" % (str(e), xlsm_file))
+    print("File may not be an Excel xlsm macro file.")
+    exit()
+
+except Exception as e:
+    # Catch any other exceptions.
+    print("File error: %s" % str(e))
+    exit()

quickinteg-2.8.0/quickinteg/external/openpyxl/__init__.py

@@ -0,0 +1,19 @@
+# Copyright (c) 2010-2023 openpyxl
+
+DEBUG = False
+
+from openpyxl.compat.numbers import NUMPY
+from openpyxl.xml import DEFUSEDXML, LXML
+from openpyxl.workbook import Workbook
+from openpyxl.reader.excel import load_workbook as open
+from openpyxl.reader.excel import load_workbook
+import openpyxl._constants as constants
+
+# Expose constants especially the version number
+
+__author__ = constants.__author__
+__author_email__ = constants.__author_email__
+__license__ = constants.__license__
+__maintainer_email__ = constants.__maintainer_email__
+__url__ = constants.__url__
+__version__ = constants.__version__

quickinteg-2.8.0/quickinteg/external/openpyxl/_constants.py

@@ -0,0 +1,13 @@
+# Copyright (c) 2010-2023 openpyxl
+
+"""
+Package metadata
+"""
+
+__author__ = "See AUTHORS"
+__author_email__ = "charlie.clark@clark-consulting.eu"
+__license__ = "MIT"
+__maintainer_email__ = "openpyxl-users@googlegroups.com"
+__url__ = "https://openpyxl.readthedocs.io"
+__version__ = "3.1.2"
+__python__ = "3.6"

quickinteg-2.8.0/quickinteg/external/openpyxl/cell/__init__.py

@@ -0,0 +1,4 @@
+# Copyright (c) 2010-2023 openpyxl
+
+from .cell import Cell, WriteOnlyCell, MergedCell
+from .read_only import ReadOnlyCell

quickinteg-2.8.0/quickinteg/external/openpyxl/cell/_writer.py

@@ -0,0 +1,158 @@
+# Copyright (c) 2010-2023 openpyxl
+
+from openpyxl.compat import safe_string
+from openpyxl.xml.functions import Element, SubElement, whitespace, XML_NS, REL_NS
+from openpyxl import LXML
+from openpyxl.utils.datetime import to_excel, to_ISO8601
+from datetime import timedelta
+
+from openpyxl.worksheet.formula import DataTableFormula, ArrayFormula
+from openpyxl.cell.rich_text import TextBlock
+
+def _set_attributes(cell, styled=None):
+    """
+    Set coordinate and datatype
+    """
+    coordinate = cell.coordinate
+    attrs = {'r': coordinate}
+    if styled:
+        attrs['s'] = f"{cell.style_id}"
+
+    if cell.data_type == "s":
+        attrs['t'] = "inlineStr"
+    elif cell.data_type != 'f':
+        attrs['t'] = cell.data_type
+
+    value = cell._value
+
+    if cell.data_type == "d":
+        if hasattr(value, "tzinfo") and value.tzinfo is not None:
+            raise TypeError("Excel does not support timezones in datetimes. "
+                    "The tzinfo in the datetime/time object must be set to None.")
+
+        if cell.parent.parent.iso_dates and not isinstance(value, timedelta):
+            value = to_ISO8601(value)
+        else:
+            attrs['t'] = "n"
+            value = to_excel(value, cell.parent.parent.epoch)
+
+    if cell.hyperlink:
+        cell.parent._hyperlinks.append(cell.hyperlink)
+
+    return value, attrs
+
+
+def etree_write_cell(xf, worksheet, cell, styled=None):
+
+    value, attributes = _set_attributes(cell, styled)
+
+    el = Element("c", attributes)
+    if value is None or value == "":
+        xf.write(el)
+        return
+
+    if cell.data_type == 'f':
+        attrib = {}
+
+        if isinstance(value, ArrayFormula):
+            attrib = dict(value)
+            value = value.text
+
+        elif isinstance(value, DataTableFormula):
+            attrib = dict(value)
+            value = None
+
+        formula = SubElement(el, 'f', attrib)
+        if value is not None and not attrib.get('t') == "dataTable":
+            formula.text = value[1:]
+            value = None
+
+    if cell.data_type == 's':
+        inline_string = SubElement(el, 'is')
+        if isinstance(value, str):
+            text = SubElement(inline_string, 't')
+            text.text = value
+            whitespace(text)
+        else:
+            for r in value:
+                se = SubElement(inline_string, 'r')
+                if isinstance(r, TextBlock):
+                    se2 = SubElement(se, 'rPr')
+                    se2.append(r.font.to_tree())
+                    text = r.name
+                else:
+                    text = r
+                text = SubElement(se, 't')
+                text.text = text
+                whitespace(text)
+
+
+
+    else:
+        cell_content = SubElement(el, 'v')
+        if value is not None:
+            cell_content.text = safe_string(value)
+
+    xf.write(el)
+
+
+def lxml_write_cell(xf, worksheet, cell, styled=False):
+    value, attributes = _set_attributes(cell, styled)
+
+    if value == '' or value is None:
+        with xf.element("c", attributes):
+            return
+
+    with xf.element('c', attributes):
+        if cell.data_type == 'f':
+            attrib = {}
+
+            if isinstance(value, ArrayFormula):
+                attrib = dict(value)
+                value = value.text
+
+            elif isinstance(value, DataTableFormula):
+                attrib = dict(value)
+                value = None
+
+            with xf.element('f', attrib):
+                if value is not None and not attrib.get('t') == "dataTable":
+                    xf.write(value[1:])
+                    value = None
+
+        if cell.data_type == 's':
+            with xf.element("is"):
+                if isinstance(value, str):
+                    attrs = {}
+                    if value != value.strip():
+                        attrs["{%s}space" % XML_NS] = "preserve"
+                    el = Element("t", attrs) # lxml can't handle xml-ns
+                    el.text = value
+                    xf.write(el)
+                    #with xf.element("t", attrs):
+                        #xf.write(value)
+                else:
+                    for r in value:
+                        with xf.element("r"):
+                            if isinstance(r, TextBlock):
+                                xf.write(r.font.to_tree(tagname='rPr'))
+                                value = r.text
+                            else:
+                                value = r
+                            attrs = {}
+                            if value != value.strip():
+                                attrs["{%s}space" % XML_NS] = "preserve"
+                            el = Element("t", attrs) # lxml can't handle xml-ns
+                            el.text = value
+                            xf.write(el)
+
+        else:
+            with xf.element("v"):
+                if value is not None:
+                    xf.write(safe_string(value))
+
+
+if LXML:
+    write_cell = lxml_write_cell
+else:
+    write_cell = etree_write_cell