table2ascii 1.1.3__tar.gz → 1.2.0__tar.gz

{table2ascii-1.1.3/table2ascii.egg-info → table2ascii-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: table2ascii
-Version: 1.1.3
+Version: 1.2.0
 Summary: Convert 2D Python lists into Unicode/ASCII tables
 Author-email: Jonah Lawrence <jonah@freshidea.com>
 License: MIT License
@@ -41,39 +41,46 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-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
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Multimedia :: Graphics :: Presentation
 Classifier: Topic :: Utilities
 Classifier: Topic :: Text Processing :: General
 Classifier: Topic :: Printing
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-extensions>=3.7.4; python_version < "3.8"
-Requires-Dist: importlib-metadata<5,>=1; python_version < "3.8"
-Requires-Dist: wcwidth<1
+Requires-Dist: wcwidth<1,>=0.5.3
 Provides-Extra: docs
 Requires-Dist: enum-tools; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx<5,>=4.0.0; extra == "docs"
 Requires-Dist: sphinx-autobuild; extra == "docs"
 Requires-Dist: sphinx-toolbox; extra == "docs"
 Requires-Dist: sphinxcontrib_trio; extra == "docs"
 Requires-Dist: sphinxext-opengraph; extra == "docs"
 Requires-Dist: sphinx-book-theme==0.3.3; extra == "docs"
+Requires-Dist: sphinxcontrib-applehelp==1.0.4; extra == "docs"
+Requires-Dist: sphinxcontrib-devhelp==1.0.2; extra == "docs"
+Requires-Dist: sphinxcontrib-htmlhelp==2.0.1; extra == "docs"
+Requires-Dist: sphinxcontrib-qthelp==1.0.3; extra == "docs"
+Requires-Dist: sphinxcontrib-serializinghtml==1.1.5; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: mypy<2,>=0.982; extra == "dev"
-Requires-Dist: pre-commit<4,>=2.0.0; extra == "dev"
+Requires-Dist: pre-commit<5,>=2.0.0; extra == "dev"
 Requires-Dist: pyright<2,>=1.0.0; extra == "dev"
-Requires-Dist: pytest<8,>=6.0.0; extra == "dev"
+Requires-Dist: pytest<9,>=6.0.0; extra == "dev"
 Requires-Dist: slotscheck<1,>=0.1.0; extra == "dev"
 Requires-Dist: taskipy<2,>=1.0.0; extra == "dev"
 Requires-Dist: tox<5,>=3.0.0; extra == "dev"
+Requires-Dist: setuptools>=66.1.0; python_version >= "3.12" and extra == "dev"
+Dynamic: license-file
 
 # table2ascii
 
@@ -91,7 +98,7 @@ Documentation and examples are available at [table2ascii.rtfd.io](https://table2
 
 `pip install -U table2ascii`
 
-**Requirements:** `Python 3.7+`
+**Requirements:** `Python 3.8+`
 
 ## 🧑‍💻 Usage
 
@@ -313,6 +320,7 @@ See the [API Reference](https://table2ascii.readthedocs.io/en/latest/api.html) f
 
 -   Tables display nicely whenever monospace fonts are fully supported
 -   Tables make terminal outputs look more professional
+-   Tables may contain contain terminal sequences, like colors
 
 ![image](https://user-images.githubusercontent.com/20955511/207134452-a1eb1b9f-e63b-459b-8feb-fc6c234e902e.png)
 

{table2ascii-1.1.3 → table2ascii-1.2.0}/README.md

@@ -14,7 +14,7 @@ Documentation and examples are available at [table2ascii.rtfd.io](https://table2
 
 `pip install -U table2ascii`
 
-**Requirements:** `Python 3.7+`
+**Requirements:** `Python 3.8+`
 
 ## 🧑‍💻 Usage
 
@@ -236,6 +236,7 @@ See the [API Reference](https://table2ascii.readthedocs.io/en/latest/api.html) f
 
 -   Tables display nicely whenever monospace fonts are fully supported
 -   Tables make terminal outputs look more professional
+-   Tables may contain contain terminal sequences, like colors
 
 ![image](https://user-images.githubusercontent.com/20955511/207134452-a1eb1b9f-e63b-459b-8feb-fc6c234e902e.png)
 

{table2ascii-1.1.3 → table2ascii-1.2.0}/pyproject.toml

@@ -1,15 +1,15 @@
 [build-system]
-requires = ["setuptools>=42"]
+requires = ["setuptools>=66.1.0"]
 build-backend = "setuptools.build_meta"
 
 
 [project]
 name = "table2ascii"
-version = "1.1.3"
+version = "1.2.0"
 authors = [{name = "Jonah Lawrence", email = "jonah@freshidea.com"}]
 description = "Convert 2D Python lists into Unicode/ASCII tables"
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 license = {file = "LICENSE"}
 keywords = ["table", "ascii", "unicode", "formatter"]
 classifiers = [
@@ -25,11 +25,13 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Multimedia :: Graphics :: Presentation",
     "Topic :: Utilities",
     "Topic :: Text Processing :: General",
@@ -38,29 +40,33 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "typing-extensions>=3.7.4; python_version<'3.8'",
-    "importlib-metadata<5,>=1; python_version<'3.8'",
-    "wcwidth<1",
+    "wcwidth>=0.5.3,<1",
 ]
 
 [project.optional-dependencies]
 docs = [
     "enum-tools",
-    "sphinx",
+    "sphinx>=4.0.0,<5",
     "sphinx-autobuild",
     "sphinx-toolbox",
     "sphinxcontrib_trio",
     "sphinxext-opengraph",
     "sphinx-book-theme==0.3.3",
+    "sphinxcontrib-applehelp==1.0.4",
+    "sphinxcontrib-devhelp==1.0.2",
+    "sphinxcontrib-htmlhelp==2.0.1",
+    "sphinxcontrib-qthelp==1.0.3",
+    "sphinxcontrib-serializinghtml==1.1.5",
 ]
 dev = [
     "mypy>=0.982,<2",
-    "pre-commit>=2.0.0,<4",
+    "pre-commit>=2.0.0,<5",
     "pyright>=1.0.0,<2",
-    "pytest>=6.0.0,<8",
+    "pytest>=6.0.0,<9",
     "slotscheck>=0.1.0,<1",
     "taskipy>=1.0.0,<2",
     "tox>=3.0.0,<5",
+    "setuptools>=66.1.0; python_version>='3.12'",
 ]
 
 [project.urls]
@@ -71,7 +77,7 @@ repository = "https://github.com/DenverCoder1/table2ascii"
 
 [tool.black]
 line-length = 100
-target-version = ["py37", "py38", "py39", "py310", "py311"]
+target-version = ["py38", "py39", "py310", "py311", "py312", "py313"]
 
 
 [tool.isort]
@@ -106,7 +112,7 @@ include = [
     "tests",
     "*.py",
 ]
-pythonVersion = "3.7"
+pythonVersion = "3.8"
 
 # https://github.com/microsoft/pyright/blob/main/docs/configuration.md
 reportInvalidStringEscapeSequence = false
@@ -127,7 +133,7 @@ reportUnnecessaryTypeIgnoreComment = true
 
 
 [tool.mypy]
-python_version = "3.11"
+python_version = "3.14"
 namespace_packages = true
 
 

{table2ascii-1.1.3 → table2ascii-1.2.0}/table2ascii/__init__.py

@@ -1,6 +1,7 @@
 """
 table2ascii - Library for converting 2D Python lists to fancy ASCII/Unicode tables
 """
+
 import sys
 from typing import TYPE_CHECKING
 

{table2ascii-1.1.3 → table2ascii-1.2.0}/table2ascii/exceptions.py

@@ -40,7 +40,7 @@ class FooterColumnCountMismatchError(ColumnCountMismatchError):
     This class is a subclass of :class:`ColumnCountMismatchError`.
 
     Attributes:
-        footer (:class:`Sequence <collections.abc.Sequence>`\ [:class:`SupportsStr`]):
+        footer (:class:`Sequence <collections.abc.Sequence>` [:class:`SupportsStr`]):
             The footer that caused the error
         expected_columns (:class:`int`): The number of columns that were expected
     """
@@ -64,10 +64,10 @@ class BodyColumnCountMismatchError(ColumnCountMismatchError):
     This class is a subclass of :class:`ColumnCountMismatchError`.
 
     Attributes:
-        body (:class:`Sequence <collections.abc.Sequence>`\ [\ :class:`Sequence <collections.abc.Sequence>`\ [:class:`SupportsStr`]]):
+        body (:class:`Sequence <collections.abc.Sequence>` [ :class:`Sequence <collections.abc.Sequence>` [:class:`SupportsStr`]]):
             The body that caused the error
         expected_columns (:class:`int`): The number of columns that were expected
-        first_invalid_row (:class:`Sequence <collections.abc.Sequence>`\ [:class:`SupportsStr`]):
+        first_invalid_row (:class:`Sequence <collections.abc.Sequence>` [:class:`SupportsStr`]):
             The first row with an invalid column count
     """
 
@@ -93,7 +93,7 @@ class AlignmentCountMismatchError(ColumnCountMismatchError):
     This class is a subclass of :class:`ColumnCountMismatchError`.
 
     Attributes:
-        alignments (:class:`Sequence <collections.abc.Sequence>`\ [:class:`Alignment`]):
+        alignments (:class:`Sequence <collections.abc.Sequence>` [:class:`Alignment`]):
             The alignments that caused the error
         expected_columns (:class:`int`): The number of columns that were expected
     """
@@ -117,7 +117,7 @@ class ColumnWidthsCountMismatchError(ColumnCountMismatchError):
     This class is a subclass of :class:`ColumnCountMismatchError`.
 
     Attributes:
-        column_widths (:class:`Sequence <collections.abc.Sequence>`\ [:data:`Optional <typing.Optional>`\ [:class:`int`]]):
+        column_widths (:class:`Sequence <collections.abc.Sequence>` [:data:`Optional <typing.Optional>` [:class:`int`]]):
             The column widths that caused the error
         expected_columns (:class:`int`): The number of columns that were expected
     """

{table2ascii-1.1.3 → table2ascii-1.2.0}/table2ascii/table_to_ascii.py

@@ -4,7 +4,7 @@ import textwrap
 from math import ceil, floor
 from collections.abc import Sequence
 
-from wcwidth import wcswidth
+from wcwidth import width
 
 from .alignment import Alignment
 from .annotations import SupportsStr
@@ -609,7 +609,8 @@ class TableToAscii:
         Returns the width of the string in characters for the purposes of monospace
         formatting. This is usually the same as the length of the string, but can be
         different for double-width characters (East Asian Wide and East Asian Fullwidth)
-        or zero-width characters (combining characters, zero-width space, etc.)
+        or zero-width characters (combining characters, zero-width space, etc.),
+        some kinds of emoji sequences, and terminal attributes (color, etc).
 
         Args:
             text: The text to measure
@@ -617,9 +618,7 @@ class TableToAscii:
         Returns:
             The width of the string in characters
         """
-        width = wcswidth(text) if self.__use_wcwidth else -1
-        # if use_wcwidth is False or wcswidth fails, fall back to len
-        return width if width >= 0 else len(text)
+        return width(text) if self.__use_wcwidth else len(text)
 
     @staticmethod
     def __is_number(text: str) -> bool:
@@ -682,20 +681,20 @@ def table2ascii(
     """Convert a 2D Python table to ASCII text
 
     Args:
-        header (:data:`Optional <typing.Optional>`\ [:class:`Sequence <collections.abc.Sequence>`\ [:class:`SupportsStr`]]):
+        header (:data:`Optional <typing.Optional>` [:class:`Sequence <collections.abc.Sequence>` [:class:`SupportsStr`]]):
             List of column values in the table's header row. All values should be :class:`str`
             or support :class:`str` conversion. If not specified, the table will not have a header row.
-        body (:data:`Optional <typing.Optional>`\ [:class:`Sequence <collections.abc.Sequence>`\ [:class:`Sequence <collections.abc.Sequence>`\ [:class:`SupportsStr`]]]):
+        body (:data:`Optional <typing.Optional>` [:class:`Sequence <collections.abc.Sequence>` [:class:`Sequence <collections.abc.Sequence>` [:class:`SupportsStr`]]]):
             2-dimensional list of values in the table's body. All values should be :class:`str`
             or support :class:`str` conversion. If not specified, the table will not have a body.
-        footer (:data:`Optional <typing.Optional>`\ [:class:`Sequence <collections.abc.Sequence>`\ [:class:`SupportsStr`]]):
+        footer (:data:`Optional <typing.Optional>` [:class:`Sequence <collections.abc.Sequence>` [:class:`SupportsStr`]]):
             List of column values in the table's footer row. All values should be :class:`str`
             or support :class:`str` conversion. If not specified, the table will not have a footer row.
         first_col_heading: Whether to add a header column separator after the first column.
             Defaults to :py:obj:`False`.
         last_col_heading: Whether to add a header column separator before the last column.
             Defaults to :py:obj:`False`.
-        column_widths (:data:`Optional <typing.Optional>`\ [:class:`Sequence <collections.abc.Sequence>`\ [:data:`Optional <typing.Optional>`\ [:class:`int`]]]):
+        column_widths (:data:`Optional <typing.Optional>` [:class:`Sequence <collections.abc.Sequence>` [:data:`Optional <typing.Optional>` [:class:`int`]]]):
             List of widths in characters for each column. Any value of :py:obj:`None`
             indicates that the column width should be determined automatically. If :py:obj:`None`
             is passed instead of a :class:`~collections.abc.Sequence`, all columns will be automatically
@@ -721,12 +720,17 @@ def table2ascii(
             Defaults to ``1``.
         style: Table style to use for styling (preset styles can be imported).
             Defaults to :ref:`PresetStyle.double_thin_compact`.
-        use_wcwidth: Whether to use :func:`wcwidth.wcswidth` to determine the width of each cell instead of
-            :func:`len`. The :func:`~wcwidth.wcswidth` function takes into account double-width characters
+        use_wcwidth: Whether to use :func:`wcwidth.width` to determine the width of each cell instead of
+            :func:`len`. The :func:`~wcwidth.width` function takes into account double-width characters
             (East Asian Wide and East Asian Fullwidth) and zero-width characters (combining characters,
-            zero-width space, etc.), whereas :func:`len` determines the width solely based on the number of
+            zero-width space, etc.), emoji sequences, and terminal control codes and escape
+            sequences, whereas :func:`len` determines the width solely based on the number of
             characters in the string. Defaults to :py:obj:`True`.
 
+            .. versionchanged:: 1.2.0
+                ``use_wcwidth`` now uses the :func:`wcwidth.width` function from the ``wcwidth`` package
+                instead of :func:`wcwidth.wcswidth` to better handle terminal control codes, escape sequences,
+                certain emoji sequences, and other strings with mixed-width characters.
             .. versionadded:: 1.0.0
 
     Returns:

{table2ascii-1.1.3 → table2ascii-1.2.0/table2ascii.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: table2ascii
-Version: 1.1.3
+Version: 1.2.0
 Summary: Convert 2D Python lists into Unicode/ASCII tables
 Author-email: Jonah Lawrence <jonah@freshidea.com>
 License: MIT License
@@ -41,39 +41,46 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-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
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Multimedia :: Graphics :: Presentation
 Classifier: Topic :: Utilities
 Classifier: Topic :: Text Processing :: General
 Classifier: Topic :: Printing
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-extensions>=3.7.4; python_version < "3.8"
-Requires-Dist: importlib-metadata<5,>=1; python_version < "3.8"
-Requires-Dist: wcwidth<1
+Requires-Dist: wcwidth<1,>=0.5.3
 Provides-Extra: docs
 Requires-Dist: enum-tools; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx<5,>=4.0.0; extra == "docs"
 Requires-Dist: sphinx-autobuild; extra == "docs"
 Requires-Dist: sphinx-toolbox; extra == "docs"
 Requires-Dist: sphinxcontrib_trio; extra == "docs"
 Requires-Dist: sphinxext-opengraph; extra == "docs"
 Requires-Dist: sphinx-book-theme==0.3.3; extra == "docs"
+Requires-Dist: sphinxcontrib-applehelp==1.0.4; extra == "docs"
+Requires-Dist: sphinxcontrib-devhelp==1.0.2; extra == "docs"
+Requires-Dist: sphinxcontrib-htmlhelp==2.0.1; extra == "docs"
+Requires-Dist: sphinxcontrib-qthelp==1.0.3; extra == "docs"
+Requires-Dist: sphinxcontrib-serializinghtml==1.1.5; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: mypy<2,>=0.982; extra == "dev"
-Requires-Dist: pre-commit<4,>=2.0.0; extra == "dev"
+Requires-Dist: pre-commit<5,>=2.0.0; extra == "dev"
 Requires-Dist: pyright<2,>=1.0.0; extra == "dev"
-Requires-Dist: pytest<8,>=6.0.0; extra == "dev"
+Requires-Dist: pytest<9,>=6.0.0; extra == "dev"
 Requires-Dist: slotscheck<1,>=0.1.0; extra == "dev"
 Requires-Dist: taskipy<2,>=1.0.0; extra == "dev"
 Requires-Dist: tox<5,>=3.0.0; extra == "dev"
+Requires-Dist: setuptools>=66.1.0; python_version >= "3.12" and extra == "dev"
+Dynamic: license-file
 
 # table2ascii
 
@@ -91,7 +98,7 @@ Documentation and examples are available at [table2ascii.rtfd.io](https://table2
 
 `pip install -U table2ascii`
 
-**Requirements:** `Python 3.7+`
+**Requirements:** `Python 3.8+`
 
 ## 🧑‍💻 Usage
 
@@ -313,6 +320,7 @@ See the [API Reference](https://table2ascii.readthedocs.io/en/latest/api.html) f
 
 -   Tables display nicely whenever monospace fonts are fully supported
 -   Tables make terminal outputs look more professional
+-   Tables may contain contain terminal sequences, like colors
 
 ![image](https://user-images.githubusercontent.com/20955511/207134452-a1eb1b9f-e63b-459b-8feb-fc6c234e902e.png)
 

table2ascii-1.2.0/table2ascii.egg-info/requires.txt

@@ -0,0 +1,27 @@
+wcwidth<1,>=0.5.3
+
+[dev]
+mypy<2,>=0.982
+pre-commit<5,>=2.0.0
+pyright<2,>=1.0.0
+pytest<9,>=6.0.0
+slotscheck<1,>=0.1.0
+taskipy<2,>=1.0.0
+tox<5,>=3.0.0
+
+[dev:python_version >= "3.12"]
+setuptools>=66.1.0
+
+[docs]
+enum-tools
+sphinx<5,>=4.0.0
+sphinx-autobuild
+sphinx-toolbox
+sphinxcontrib_trio
+sphinxext-opengraph
+sphinx-book-theme==0.3.3
+sphinxcontrib-applehelp==1.0.4
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.1
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.5

{table2ascii-1.1.3 → table2ascii-1.2.0}/tests/test_convert.py

@@ -286,6 +286,25 @@ def test_east_asian_wide_characters_and_zero_width_wcwidth():
     assert text2 == expected
 
 
+def test_terminal_sequences_width_wcwidth():
+    text = t2a(
+        header=["\x1b[38;2;255;0;0mX", "Foo", None],
+        body=[[1, "Foo", None]],
+        footer=["\x1b]8;;https://example.com\x07X\x1b]8;;\x07", "Foo", None],
+        first_col_heading=True,
+    )
+    expected = (
+        "╔═══╦════════════╗\n"
+        "║ \x1b[38;2;255;0;0mX ║ Foo   None ║\n"
+        "╟───╫────────────╢\n"
+        "║ 1 ║ Foo   None ║\n"
+        "╟───╫────────────╢\n"
+        "║ \x1b]8;;https://example.com\x07X\x1b]8;;\x07 ║ Foo   None ║\n"
+        "╚═══╩════════════╝"
+    )
+    assert text == expected
+
+
 def test_east_asian_wide_characters_and_zero_width_no_wcwidth():
     # using len() to count the number of characters
     text = t2a(

table2ascii-1.1.3/table2ascii.egg-info/requires.txt

@@ -1,23 +0,0 @@
-wcwidth<1
-
-[:python_version < "3.8"]
-typing-extensions>=3.7.4
-importlib-metadata<5,>=1
-
-[dev]
-mypy<2,>=0.982
-pre-commit<4,>=2.0.0
-pyright<2,>=1.0.0
-pytest<8,>=6.0.0
-slotscheck<1,>=0.1.0
-taskipy<2,>=1.0.0
-tox<5,>=3.0.0
-
-[docs]
-enum-tools
-sphinx
-sphinx-autobuild
-sphinx-toolbox
-sphinxcontrib_trio
-sphinxext-opengraph
-sphinx-book-theme==0.3.3