flexablelib 3.5.2__tar.gz → 3.5.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (124) hide show
  1. {flexablelib-3.5.2 → flexablelib-3.5.4}/CHANGELOG.md +50 -0
  2. {flexablelib-3.5.2 → flexablelib-3.5.4}/PKG-INFO +9 -9
  3. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/colors.py +6 -4
  4. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/table.py +41 -3
  5. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib.egg-info/PKG-INFO +9 -9
  6. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib.egg-info/SOURCES.txt +2 -0
  7. flexablelib-3.5.4/flexablelib.egg-info/requires.txt +35 -0
  8. {flexablelib-3.5.2 → flexablelib-3.5.4}/package.json +1 -1
  9. flexablelib-3.5.4/tests/test_v353_fixes.py +237 -0
  10. flexablelib-3.5.4/tests/test_v354_fixes.py +219 -0
  11. flexablelib-3.5.2/flexablelib.egg-info/requires.txt +0 -35
  12. {flexablelib-3.5.2 → flexablelib-3.5.4}/.coveragerc +0 -0
  13. {flexablelib-3.5.2 → flexablelib-3.5.4}/LICENSE +0 -0
  14. {flexablelib-3.5.2 → flexablelib-3.5.4}/MANIFEST.in +0 -0
  15. {flexablelib-3.5.2 → flexablelib-3.5.4}/README.md +0 -0
  16. {flexablelib-3.5.2 → flexablelib-3.5.4}/examples/admin.py +0 -0
  17. {flexablelib-3.5.2 → flexablelib-3.5.4}/examples/dashboard.py +0 -0
  18. {flexablelib-3.5.2 → flexablelib-3.5.4}/examples/keys.py +0 -0
  19. {flexablelib-3.5.2 → flexablelib-3.5.4}/examples/video/demo.py +0 -0
  20. {flexablelib-3.5.2 → flexablelib-3.5.4}/examples/video/render.py +0 -0
  21. {flexablelib-3.5.2 → flexablelib-3.5.4}/examples/video/scenes.py +0 -0
  22. {flexablelib-3.5.2 → flexablelib-3.5.4}/examples/video/thumbnail.py +0 -0
  23. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/__init__.py +0 -0
  24. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/_frames.py +0 -0
  25. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/_images.py +0 -0
  26. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/_legacy/__init__.py +0 -0
  27. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/_legacy/screen.py +0 -0
  28. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/_legacy/widgets.py +0 -0
  29. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/_speedups.c +0 -0
  30. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/_width_tables.h +0 -0
  31. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/box_topology.py +0 -0
  32. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/cells.py +0 -0
  33. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/columns.py +0 -0
  34. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/fast.py +0 -0
  35. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/identifiers.py +0 -0
  36. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/layout.py +0 -0
  37. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/merges.py +0 -0
  38. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/options.py +0 -0
  39. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/py.typed +0 -0
  40. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/readers.py +0 -0
  41. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/screen.py +0 -0
  42. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/style_compositions.py +0 -0
  43. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/table_strings.py +0 -0
  44. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/text_width.py +0 -0
  45. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/utils.py +0 -0
  46. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/widgets.py +0 -0
  47. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib/writers.py +0 -0
  48. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib.egg-info/dependency_links.txt +0 -0
  49. {flexablelib-3.5.2 → flexablelib-3.5.4}/flexablelib.egg-info/top_level.txt +0 -0
  50. {flexablelib-3.5.2 → flexablelib-3.5.4}/pytest.ini +0 -0
  51. {flexablelib-3.5.2 → flexablelib-3.5.4}/setup.cfg +0 -0
  52. {flexablelib-3.5.2 → flexablelib-3.5.4}/setup.py +0 -0
  53. {flexablelib-3.5.2 → flexablelib-3.5.4}/style_examples.md +0 -0
  54. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/conftest.py +0 -0
  55. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/helpers.py +0 -0
  56. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_align_indicators.py +0 -0
  57. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_box_topology.py +0 -0
  58. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_cells.py +0 -0
  59. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_columns.py +0 -0
  60. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_excel.py +0 -0
  61. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_features.py +0 -0
  62. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_issues.py +0 -0
  63. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_merge_edge_matrix.py +0 -0
  64. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_merge_fill.py +0 -0
  65. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_merges.py +0 -0
  66. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_public_api_edges.py +0 -0
  67. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_readme_examples.py +0 -0
  68. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_stress_matrix.py +0 -0
  69. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_style_line_widths.py +0 -0
  70. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_styles.py +0 -0
  71. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_text_width.py +0 -0
  72. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_two_pass_measurement.py +0 -0
  73. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_upstream_issues.py +0 -0
  74. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v2021_fixes.py +0 -0
  75. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v210_rows_copy.py +0 -0
  76. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v2110_fixes.py +0 -0
  77. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v211_fixes.py +0 -0
  78. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v213_features.py +0 -0
  79. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v214_features.py +0 -0
  80. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v215_features.py +0 -0
  81. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v216_features.py +0 -0
  82. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v217_features.py +0 -0
  83. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v218_features.py +0 -0
  84. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v219_coverage.py +0 -0
  85. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v219_fixes.py +0 -0
  86. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v220_exports.py +0 -0
  87. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v221_fixes.py +0 -0
  88. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v222_fixes.py +0 -0
  89. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v223_fixes.py +0 -0
  90. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v224_fixes.py +0 -0
  91. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v230_none.py +0 -0
  92. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v231_fixes.py +0 -0
  93. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v232_merge_ansi.py +0 -0
  94. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v300_style_names.py +0 -0
  95. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v310_layout.py +0 -0
  96. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v320_tui.py +0 -0
  97. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v330_components.py +0 -0
  98. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v330_frames.py +0 -0
  99. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v330_layout.py +0 -0
  100. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v330_tui.py +0 -0
  101. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v331_formats.py +0 -0
  102. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v331_panel_width.py +0 -0
  103. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v331_readers_bom.py +0 -0
  104. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v331_readers_edges.py +0 -0
  105. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v331_tabs.py +0 -0
  106. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v340_accessibility.py +0 -0
  107. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v340_core.py +0 -0
  108. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v340_input.py +0 -0
  109. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v350_images.py +0 -0
  110. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v350_images_core.py +0 -0
  111. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/test_v352_fixes.py +0 -0
  112. {flexablelib-3.5.2 → flexablelib-3.5.4}/tests/wincon_child.py +0 -0
  113. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/bench_frames.py +0 -0
  114. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/bench_images.py +0 -0
  115. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/benchmark.py +0 -0
  116. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/gen_ascii_table.py +0 -0
  117. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/generate_width_tables.py +0 -0
  118. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/image_demo.py +0 -0
  119. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/pty_check.py +0 -0
  120. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/readme_gallery.py +0 -0
  121. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/stress_matrix.py +0 -0
  122. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/style_examples.py +0 -0
  123. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/text_to_png.py +0 -0
  124. {flexablelib-3.5.2 → flexablelib-3.5.4}/tools/wheel_check.py +0 -0
@@ -2,6 +2,56 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
+ ## [3.5.4] - 2026-11-13
6
+
7
+ ### Fixed
8
+ - **Kitty keyboard reports with out-of-range code points** (`CSI 97;1;99999999u`,
9
+ a shifted key above U+10FFFF) no longer raise `ValueError` from
10
+ `KeyParser.feed()`: the invalid text or shifted code is ignored and the
11
+ key is reported as usual.
12
+ - **Escape followed by a bracketed paste** in the same read: the paste text
13
+ no longer starts with `\x1b[200~`.
14
+ - **Input split across reads** parses like the whole input: `ESC ESC` waits
15
+ for the next byte, so `ESC ESC [A` read in pieces is still `alt+up`
16
+ (a lone double Escape still gives two `escape` keys after the pause).
17
+ - **`MoneyInput` clicks** put the cursor under the clicked character (the
18
+ currency symbol was counted as text, so the cursor landed one place to
19
+ the right); clicking an empty field and then pressing `ctrl+left` no
20
+ longer raises `IndexError`.
21
+ - **`TextInput`** (and every input built on it) keeps a `cursor_pos` set
22
+ out of range from outside within the text instead of raising on word
23
+ moves.
24
+ - **`CoordinatesInput`** renders at widths 1 and 2 (latitude above
25
+ longitude) instead of raising `ValueError`.
26
+ - **An empty `Table` with `show_index=True`** renders like without the index
27
+ instead of raising `TypeError`.
28
+
29
+ ### Changed
30
+ - `Key` and `MouseEvent` keep all their fields through `copy`, `deepcopy`
31
+ and `pickle` (a `MouseEvent` could not be copied at all).
32
+
33
+ ## [3.5.3] - 2026-11-12
34
+
35
+ ### Fixed
36
+ - **Index labels with a `row_filter` (or `sort_by`) and hidden empty rows**
37
+ (`show_empty_rows=False`): the visible rows are numbered 0, 1, 2 as
38
+ without a filter, instead of 0, 2, 4 (the hidden empty rows used to take
39
+ a number). `to_records`, `to_csv`, `paginate` and `stream` agree.
40
+ - **`stream()` index column** is as wide as in `compose()` when rows are
41
+ hidden by `row_filter` or `show_empty_rows=False`: it was sized for every
42
+ row, so the streamed table came out one column wider.
43
+ - **Contrast checks** (`parse_color`, `contrast_ratio`, `Theme.contrast()`)
44
+ understand every colour the core draws: `colour:N`, hex without `#`
45
+ (`ff8800`), and `greyNN` as the xterm grey really shown. A theme using
46
+ `colour:N` reported no ratio, or 1:1 for `black on colour:226`.
47
+ - **Colour tokens with non-ASCII digits** (`'²'`, `'٣'`) raise
48
+ `ColourError` like any unknown colour, instead of a bare `ValueError` or
49
+ being read as a palette index.
50
+
51
+ ### Changed
52
+ - Hiding empty rows no longer re-scans every row once per row while
53
+ numbering the index (quadratic in the row count).
54
+
5
55
  ## [3.5.2] - 2026-11-12
6
56
 
7
57
  ### Fixed
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: flexablelib
3
- Version: 3.5.2
3
+ Version: 3.5.4
4
4
  Summary: Fast, dependency-free terminal tables for Python: 54 border styles, ANSI colors, cell merges, decimal alignment, width fitting, and CSV/Markdown/HTML/Excel/LaTeX I/O.
5
5
  Home-page: https://github.com/Opus-Perpetuus/flexablelib
6
6
  Author: Benjamin Ramirez
@@ -46,15 +46,15 @@ Requires-Dist: openpyxl>=3.0; extra == "excel"
46
46
  Provides-Extra: html
47
47
  Requires-Dist: lxml>=4.0; extra == "html"
48
48
  Provides-Extra: tui
49
- Requires-Dist: flexablelib-tui==3.5.2; extra == "tui"
49
+ Requires-Dist: flexablelib-tui==3.5.4; extra == "tui"
50
50
  Provides-Extra: components
51
- Requires-Dist: flexablelib-components==3.5.2; extra == "components"
51
+ Requires-Dist: flexablelib-components==3.5.4; extra == "components"
52
52
  Provides-Extra: speed
53
- Requires-Dist: flexablelib-speedups==3.5.2; extra == "speed"
53
+ Requires-Dist: flexablelib-speedups==3.5.4; extra == "speed"
54
54
  Provides-Extra: images
55
55
  Requires-Dist: Pillow>=8; extra == "images"
56
- Requires-Dist: flexablelib-tui==3.5.2; extra == "images"
57
- Requires-Dist: flexablelib-components==3.5.2; extra == "images"
56
+ Requires-Dist: flexablelib-tui==3.5.4; extra == "images"
57
+ Requires-Dist: flexablelib-components==3.5.4; extra == "images"
58
58
  Provides-Extra: svg
59
59
  Requires-Dist: cairosvg>=2.5; extra == "svg"
60
60
  Provides-Extra: all
@@ -62,9 +62,9 @@ Requires-Dist: pandas>=1.0; extra == "all"
62
62
  Requires-Dist: openpyxl>=3.0; extra == "all"
63
63
  Requires-Dist: lxml>=4.0; extra == "all"
64
64
  Requires-Dist: Pillow>=8; extra == "all"
65
- Requires-Dist: flexablelib-tui==3.5.2; extra == "all"
66
- Requires-Dist: flexablelib-components==3.5.2; extra == "all"
67
- Requires-Dist: flexablelib-speedups==3.5.2; extra == "all"
65
+ Requires-Dist: flexablelib-tui==3.5.4; extra == "all"
66
+ Requires-Dist: flexablelib-components==3.5.4; extra == "all"
67
+ Requires-Dist: flexablelib-speedups==3.5.4; extra == "all"
68
68
  Dynamic: author
69
69
  Dynamic: author-email
70
70
  Dynamic: classifier
@@ -63,7 +63,7 @@ COLOURS = {
63
63
 
64
64
  _HEX_RE = re.compile(r'^#?([0-9a-fA-F]{6})$')
65
65
  # Rich / X11-style percentage greys: 'grey23', 'gray70', 'grey100'.
66
- _GREY_RE = re.compile(r'^gr[ae]y(\d{1,3})$')
66
+ _GREY_RE = re.compile(r'^gr[ae]y([0-9]{1,3})$')
67
67
 
68
68
  # The xterm 256-colour grey levels: black (16), the 24-step ramp
69
69
  # (232..255, level 8 + 10*i) and white (231).
@@ -76,7 +76,9 @@ def _grey_index(percent: int) -> int:
76
76
  raise ColourError(f'grey percentage out of range: {percent}')
77
77
  target = percent * 255 / 100
78
78
  return min(_GREY_LEVELS, key=lambda level: abs(level[0] - target))[1]
79
- _INDEX_RE = re.compile(r'^(?:color|colour):(\d{1,3})$')
79
+ # ASCII digits only: '²'.isdigit() is True but int('²') fails.
80
+ _DIGITS_RE = re.compile(r'^[0-9]+$')
81
+ _INDEX_RE = re.compile(r'^(?:color|colour):([0-9]{1,3})$')
80
82
 
81
83
 
82
84
  class ColourError(ValueError):
@@ -110,7 +112,7 @@ def _colour_codes(token: str, background: bool = False) -> list:
110
112
  raise ColourError(f'256-colour index out of range: {index}')
111
113
  return [48 if background else 38, 5, index]
112
114
 
113
- if token.isdigit():
115
+ if _DIGITS_RE.match(token):
114
116
  index = int(token)
115
117
  if not 0 <= index <= 255:
116
118
  raise ColourError(f'256-colour index out of range: {index}')
@@ -320,7 +322,7 @@ def _token_hex(token: str, named: dict) -> Optional[str]:
320
322
  index_match = _INDEX_RE.match(token)
321
323
  if index_match:
322
324
  return _xterm_hex(int(index_match.group(1)))
323
- if token.isdigit():
325
+ if _DIGITS_RE.match(token):
324
326
  return _xterm_hex(int(token))
325
327
  return None
326
328
 
@@ -3146,8 +3146,10 @@ class Table(object):
3146
3146
  self.__semi_processed_columns_with_i
3147
3147
  )
3148
3148
 
3149
+ # A table with no columns has nothing to number: the index column
3150
+ # alone would have no cells, so it is drawn as without the index.
3149
3151
  return self.__form_string(
3150
- table_with_i=self.__show_index
3152
+ table_with_i=self.__show_index and len(self.__columns) != 0
3151
3153
  )
3152
3154
 
3153
3155
  def __get_string_table_width(self) -> int:
@@ -4046,6 +4048,12 @@ class Table(object):
4046
4048
  # One level of copying is enough: the pipeline replaces whole cells,
4047
4049
  # it never mutates one in place.
4048
4050
  rows_with_i = [list(row) for row in self.__rows_with_i]
4051
+ # Measured once: the property walks every row, and asking it per row
4052
+ # made hiding empty rows quadratic in the row count.
4053
+ empty_rows = (
4054
+ frozenset() if self.__show_empty_rows
4055
+ else frozenset(self.__empty_row_indexes)
4056
+ )
4049
4057
  for row_i, row in enumerate(rows_with_i):
4050
4058
  if self.__show_empty_rows:
4051
4059
  rows_with_i[row_i][0] = row[0](
@@ -4056,7 +4064,7 @@ class Table(object):
4056
4064
  rows_with_i[row_i][0] = row[0](
4057
4065
  self.__i_start,
4058
4066
  self.__i_step,
4059
- row_i not in self.__empty_row_indexes
4067
+ row_i not in empty_rows
4060
4068
  )
4061
4069
  # For adding the missing value where the ValuePlacer
4062
4070
  # is used (in the rows with index).
@@ -4085,12 +4093,15 @@ class Table(object):
4085
4093
  rows = [rows[i] for i in order]
4086
4094
  rows_with_i = [rows_with_i[i] for i in order]
4087
4095
  # Index was consumed in stored order; renumber visible rows so
4088
- # the column stays contiguous after a filter.
4096
+ # the column stays contiguous after a filter. Empty rows that
4097
+ # show_empty_rows=False hides take no number, as without a
4098
+ # filter -- counting them left gaps (0, 2, 4).
4089
4099
  self.__index_counter.reset_count()
4090
4100
  for row_i, row in enumerate(rows_with_i):
4091
4101
  rows_with_i[row_i][0] = self.__index_counter(
4092
4102
  self.__i_start,
4093
4103
  self.__i_step,
4104
+ self.__show_empty_rows or order[row_i] not in empty_stored,
4094
4105
  )
4095
4106
 
4096
4107
  if self.__roman_index and rows_with_i:
@@ -5599,6 +5610,8 @@ class Table(object):
5599
5610
  total = work.__real_row_count + len(rows)
5600
5611
  except TypeError:
5601
5612
  total = None
5613
+ if total and isinstance(rows, (list, tuple)):
5614
+ total = self.__stream_shown_rows(rows, total)
5602
5615
  if total:
5603
5616
  labels = [work.index_start + work.index_step * k
5604
5617
  for k in (0, total - 1)]
@@ -5648,6 +5661,31 @@ class Table(object):
5648
5661
  for row in streamed:
5649
5662
  self.add_row(row)
5650
5663
 
5664
+ def __stream_shown_rows(self, rows, total):
5665
+ """
5666
+ How many of the existing and streamed ``rows`` ``compose()`` would
5667
+ show: ``row_filter`` and hidden empty rows leave out lines, and the
5668
+ index column is sized for the labels that are really drawn. Reserving
5669
+ a label for every row made the index column wider than in
5670
+ ``compose()`` (``9`` rows shown but ``10`` reserved, say).
5671
+ """
5672
+ try:
5673
+ probe = self.__display_clone(include_rows=True)
5674
+ for row in rows:
5675
+ probe.add_row(list(row))
5676
+ headers = list(probe.headers)
5677
+ stored = [probe.__stored_row(row_i, headers)
5678
+ for row_i in range(probe.__real_row_count)]
5679
+ order = probe.__display_row_order(stored)
5680
+ hidden = (set() if probe.__show_empty_rows
5681
+ else set(probe.__empty_row_indexes))
5682
+ shown = len([row_i for row_i in order if row_i not in hidden])
5683
+ except Exception:
5684
+ # A row the stream itself will reject: keep the plain count and
5685
+ # let add_row() report it where it always has.
5686
+ return total
5687
+ return max(1, shown)
5688
+
5651
5689
  def __stream_closing_lines(self, widths):
5652
5690
  """
5653
5691
  ``(n, lines)``: the trailing lines a one-row and a two-row table
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: flexablelib
3
- Version: 3.5.2
3
+ Version: 3.5.4
4
4
  Summary: Fast, dependency-free terminal tables for Python: 54 border styles, ANSI colors, cell merges, decimal alignment, width fitting, and CSV/Markdown/HTML/Excel/LaTeX I/O.
5
5
  Home-page: https://github.com/Opus-Perpetuus/flexablelib
6
6
  Author: Benjamin Ramirez
@@ -46,15 +46,15 @@ Requires-Dist: openpyxl>=3.0; extra == "excel"
46
46
  Provides-Extra: html
47
47
  Requires-Dist: lxml>=4.0; extra == "html"
48
48
  Provides-Extra: tui
49
- Requires-Dist: flexablelib-tui==3.5.2; extra == "tui"
49
+ Requires-Dist: flexablelib-tui==3.5.4; extra == "tui"
50
50
  Provides-Extra: components
51
- Requires-Dist: flexablelib-components==3.5.2; extra == "components"
51
+ Requires-Dist: flexablelib-components==3.5.4; extra == "components"
52
52
  Provides-Extra: speed
53
- Requires-Dist: flexablelib-speedups==3.5.2; extra == "speed"
53
+ Requires-Dist: flexablelib-speedups==3.5.4; extra == "speed"
54
54
  Provides-Extra: images
55
55
  Requires-Dist: Pillow>=8; extra == "images"
56
- Requires-Dist: flexablelib-tui==3.5.2; extra == "images"
57
- Requires-Dist: flexablelib-components==3.5.2; extra == "images"
56
+ Requires-Dist: flexablelib-tui==3.5.4; extra == "images"
57
+ Requires-Dist: flexablelib-components==3.5.4; extra == "images"
58
58
  Provides-Extra: svg
59
59
  Requires-Dist: cairosvg>=2.5; extra == "svg"
60
60
  Provides-Extra: all
@@ -62,9 +62,9 @@ Requires-Dist: pandas>=1.0; extra == "all"
62
62
  Requires-Dist: openpyxl>=3.0; extra == "all"
63
63
  Requires-Dist: lxml>=4.0; extra == "all"
64
64
  Requires-Dist: Pillow>=8; extra == "all"
65
- Requires-Dist: flexablelib-tui==3.5.2; extra == "all"
66
- Requires-Dist: flexablelib-components==3.5.2; extra == "all"
67
- Requires-Dist: flexablelib-speedups==3.5.2; extra == "all"
65
+ Requires-Dist: flexablelib-tui==3.5.4; extra == "all"
66
+ Requires-Dist: flexablelib-components==3.5.4; extra == "all"
67
+ Requires-Dist: flexablelib-speedups==3.5.4; extra == "all"
68
68
  Dynamic: author
69
69
  Dynamic: author-email
70
70
  Dynamic: classifier
@@ -105,6 +105,8 @@ tests/test_v340_input.py
105
105
  tests/test_v350_images.py
106
106
  tests/test_v350_images_core.py
107
107
  tests/test_v352_fixes.py
108
+ tests/test_v353_fixes.py
109
+ tests/test_v354_fixes.py
108
110
  tests/wincon_child.py
109
111
  tools/bench_frames.py
110
112
  tools/bench_images.py
@@ -0,0 +1,35 @@
1
+
2
+ [all]
3
+ pandas>=1.0
4
+ openpyxl>=3.0
5
+ lxml>=4.0
6
+ Pillow>=8
7
+ flexablelib-tui==3.5.4
8
+ flexablelib-components==3.5.4
9
+ flexablelib-speedups==3.5.4
10
+
11
+ [components]
12
+ flexablelib-components==3.5.4
13
+
14
+ [excel]
15
+ openpyxl>=3.0
16
+
17
+ [html]
18
+ lxml>=4.0
19
+
20
+ [images]
21
+ Pillow>=8
22
+ flexablelib-tui==3.5.4
23
+ flexablelib-components==3.5.4
24
+
25
+ [pandas]
26
+ pandas>=1.0
27
+
28
+ [speed]
29
+ flexablelib-speedups==3.5.4
30
+
31
+ [svg]
32
+ cairosvg>=2.5
33
+
34
+ [tui]
35
+ flexablelib-tui==3.5.4
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "flexablelib",
3
- "version": "3.5.2",
3
+ "version": "3.5.4",
4
4
  "private": true,
5
5
  "description": "Flexible console and HTML tables for Python: styles, merges, colors, widths, decimal alignment.",
6
6
  "repository": {
@@ -0,0 +1,237 @@
1
+ """3.5.3: index labels stay contiguous when a row_filter (or sort_by) meets
2
+ hidden empty rows; stream() sizes the index column like compose(); the
3
+ contrast checks understand every colour the core draws; colour tokens with
4
+ non-ASCII digits raise ColourError."""
5
+
6
+ import io
7
+
8
+ import pytest
9
+
10
+ from flexablelib import Table
11
+ from flexablelib.colors import ColourError, parse_spec, spec_to_css
12
+ from flexablelib.text_width import strip_ansi
13
+
14
+ ROWS = [['a'], [None], ['b'], [''], ['c'], ['zz']]
15
+
16
+
17
+ def body(table):
18
+ """The data lines of a single-column table with an index column."""
19
+ return [line for line in strip_ansi(str(table)).split('\n')
20
+ if line.startswith('|') and ' h ' not in line
21
+ and not line.startswith('| i')]
22
+
23
+
24
+ def indexed(rows=ROWS, **options):
25
+ table = Table(headers=['h'], rows=[list(r) for r in rows])
26
+ table.show_index = True
27
+ table.max_width = 120
28
+ for name, value in options.items():
29
+ setattr(table, name, value)
30
+ return table
31
+
32
+
33
+ class TestIndexWithFilterAndHiddenEmptyRows:
34
+ def test_filter_keeps_numbers_contiguous(self):
35
+ table = indexed(show_empty_rows=False,
36
+ row_filter=lambda row: row[0] != 'zz')
37
+ assert body(table) == ['| 0 | a |', '| 1 | b |', '| 2 | c |']
38
+
39
+ def test_same_numbers_as_without_filter(self):
40
+ plain = indexed(show_empty_rows=False)
41
+ keep_all_but_one = indexed(show_empty_rows=False,
42
+ row_filter=lambda row: row[0] != 'a')
43
+ assert [line.split('|')[1] for line in body(keep_all_but_one)] == \
44
+ [line.split('|')[1] for line in body(plain)][:3]
45
+
46
+ def test_sort_by_with_hidden_empty_rows(self):
47
+ table = indexed(show_empty_rows=False, sort_by=0, sort_reverse=True)
48
+ labels = [line.split('|')[1].strip() for line in body(table)]
49
+ assert labels == ['0', '1', '2', '3']
50
+
51
+ def test_roman_and_start_step(self):
52
+ table = indexed(show_empty_rows=False, roman_index=True,
53
+ index_start=1, row_filter=lambda row: row[0] != 'b')
54
+ labels = [line.split('|')[1].strip() for line in body(table)]
55
+ assert labels == ['I', 'II', 'III']
56
+ table = indexed(show_empty_rows=False, index_start=10, index_step=5,
57
+ row_filter=lambda row: row[0] != 'b')
58
+ labels = [line.split('|')[1].strip() for line in body(table)]
59
+ assert labels == ['10', '15', '20']
60
+
61
+ def test_empty_rows_shown_keep_their_number(self):
62
+ table = indexed(show_empty_rows=True,
63
+ row_filter=lambda row: row[0] != 'zz')
64
+ labels = [line.split('|')[1].strip() for line in body(table)]
65
+ assert labels == ['0', '1', '2', '3', '4']
66
+
67
+ def test_exports_and_pages_agree(self):
68
+ table = indexed(show_empty_rows=False,
69
+ row_filter=lambda row: row[0] != 'zz')
70
+ assert [r['i'] for r in table.to_records(include_index=True)] == \
71
+ [0, 1, 2]
72
+ pages = table.paginate(2)
73
+ assert '| 2 | c |' in strip_ansi(pages[-1])
74
+
75
+
76
+ class TestStreamIndexWidth:
77
+ @pytest.mark.parametrize('roman', [False, True])
78
+ @pytest.mark.parametrize('show_empty', [False, True])
79
+ def test_stream_matches_compose(self, roman, show_empty):
80
+ rows = [['x'], [None], [''], ['y']] * 3
81
+
82
+ def make(data):
83
+ return indexed(data, show_empty_rows=show_empty,
84
+ roman_index=roman)
85
+
86
+ full = str(make(rows + rows))
87
+ streamed = '\n'.join(make(rows).stream([list(r) for r in rows]))
88
+ assert streamed == full
89
+
90
+ def test_stream_with_filter_matches_compose(self):
91
+ rows = [['x%d' % k] for k in range(12)] + [[None]]
92
+
93
+ def keep(row):
94
+ return row[0] is None or row[0] in ('x0', 'x1', 'x2')
95
+
96
+ full = str(indexed(rows + rows, row_filter=keep,
97
+ show_empty_rows=False))
98
+ streamed = '\n'.join(indexed(rows, row_filter=keep,
99
+ show_empty_rows=False).stream(rows))
100
+ assert streamed == full
101
+
102
+ def test_generator_still_streams(self):
103
+ table = indexed([['a']])
104
+ lines = list(table.stream(iter([['b'], ['c']])))
105
+ assert any('| 2 | c |' in strip_ansi(line) for line in lines)
106
+
107
+ def test_bad_row_still_reported_by_add_row(self):
108
+ table = indexed([['a']])
109
+ lines = []
110
+ with pytest.raises(TypeError):
111
+ for line in table.stream([['b'], 5]):
112
+ lines.append(line)
113
+ # The rows before the bad one were drawn first, as they always were.
114
+ assert any('| 1 | b |' in strip_ansi(line) for line in lines)
115
+
116
+
117
+ class TestNonAsciiDigits:
118
+ @pytest.mark.parametrize('token', ['²', '٣', 'color:٣', 'grey٣',
119
+ 'on ²'])
120
+ def test_colour_error(self, token):
121
+ with pytest.raises(ColourError):
122
+ parse_spec(token)
123
+
124
+ def test_css_colour_error_or_ignored(self):
125
+ try:
126
+ css = spec_to_css('²')
127
+ except ColourError:
128
+ return
129
+ assert css == ''
130
+
131
+ def test_ascii_digits_still_work(self):
132
+ assert parse_spec('93') == '\x1b[38;5;93m'
133
+ assert parse_spec('colour:93') == '\x1b[38;5;93m'
134
+ assert parse_spec('grey50') == '\x1b[38;5;244m'
135
+
136
+
137
+ def _a11y():
138
+ return pytest.importorskip('flexablelib_tui.accessibility')
139
+
140
+
141
+ class TestContrastUnderstandsCoreColours:
142
+ @pytest.mark.parametrize('token, rgb', [
143
+ ('colour:93', (135, 0, 255)),
144
+ ('COLOUR:93', (135, 0, 255)),
145
+ ('color:93', (135, 0, 255)),
146
+ ('ff8800', (255, 136, 0)),
147
+ ('#FF8800', (255, 136, 0)),
148
+ ('#abc', (170, 187, 204)),
149
+ ('93', (135, 0, 255)),
150
+ ('grey23', (58, 58, 58)), # xterm 237, what parse_spec draws
151
+ ('gray100', (255, 255, 255)),
152
+ ('grey0', (0, 0, 0)),
153
+ ('bright_white', (255, 255, 255)),
154
+ ])
155
+ def test_parse_color(self, token, rgb):
156
+ assert _a11y().parse_color(token) == rgb
157
+
158
+ @pytest.mark.parametrize('token', ['grey101', '#ab', '#gggggg', '²',
159
+ '300', 'color:300', 'nope', '', None])
160
+ def test_not_a_colour(self, token):
161
+ assert _a11y().parse_color(token) is None
162
+
163
+ def test_every_core_colour_is_understood(self):
164
+ a11y = _a11y()
165
+ tokens = (['colour:%d' % n for n in range(0, 256, 7)]
166
+ + ['grey%d' % n for n in range(0, 101, 3)]
167
+ + ['%d' % n for n in range(0, 256, 11)]
168
+ + ['ff8800', '#00aa11', 'bright_blue', 'gray'])
169
+ for token in tokens:
170
+ parse_spec(token)
171
+ assert a11y.parse_color(token) is not None, token
172
+
173
+ def test_grey_matches_drawn_xterm_grey(self):
174
+ a11y = _a11y()
175
+ for percent in range(0, 101):
176
+ code = parse_spec('grey%d' % percent)
177
+ index = int(code[:-1].split(';')[-1])
178
+ assert a11y.parse_color('grey%d' % percent) == \
179
+ a11y.parse_color('colour:%d' % index)
180
+
181
+ def test_theme_contrast(self):
182
+ C = pytest.importorskip('flexablelib_components')
183
+ ratios = C.Theme(accent='black on colour:226').contrast()
184
+ assert ratios['accent'] > 15
185
+ assert C.Theme(accent='colour:93').contrast()['accent'] == \
186
+ C.Theme(accent='#8700ff').contrast()['accent']
187
+ assert C.Theme(accent='ff8800').contrast()['accent'] == \
188
+ C.Theme(accent='#ff8800').contrast()['accent']
189
+
190
+ def test_contrast_ratio_accepts_core_forms(self):
191
+ a11y = _a11y()
192
+ assert round(a11y.contrast_ratio('colour:231', 'colour:16'), 1) == 21.0
193
+ assert round(a11y.contrast_ratio('ffffff', '000000'), 1) == 21.0
194
+
195
+
196
+ class TestAccessibilityEdges:
197
+ def test_settings_update_and_repr(self):
198
+ a11y = _a11y()
199
+ settings = a11y.Settings()
200
+ with pytest.raises(TypeError):
201
+ settings.update(not_a_setting=True)
202
+ settings.update(ascii=1, theme=None)
203
+ assert settings.ascii is True
204
+ assert repr(settings).startswith('Settings(') and 'ascii=True' in \
205
+ repr(settings)
206
+
207
+ def test_from_env_flags(self):
208
+ a11y = _a11y()
209
+ out = a11y.Settings.from_env({'FLEXABLELIB_ASCII': ' Yes ',
210
+ 'FLEXABLELIB_REDUCED_MOTION': '0'})
211
+ assert out.ascii is True and out.reduced_motion is False
212
+
213
+ def test_describe_error_and_description(self):
214
+ a11y = _a11y()
215
+ text = a11y.describe({'label': 'Correo', 'role': 'textbox',
216
+ 'value': 'x', 'error': 'inválido',
217
+ 'description': 'Tu correo de trabajo'},
218
+ lang='es')
219
+ assert text.startswith('Correo')
220
+ assert 'inválido' in text and text.endswith('Tu correo de trabajo')
221
+
222
+ def test_announcer_closed_stream_is_quiet(self):
223
+ a11y = _a11y()
224
+ stream = io.StringIO()
225
+ stream.close()
226
+ announcer = a11y.Announcer(stream)
227
+ announcer.announce('hola')
228
+ assert announcer.history[-1:] and 'hola' in str(announcer.history[-1])
229
+
230
+ def test_announcer_file_and_callable(self, tmp_path):
231
+ a11y = _a11y()
232
+ path = tmp_path / 'anuncios.txt'
233
+ a11y.Announcer(str(path), prefix='» ').announce('listo')
234
+ assert path.read_text(encoding='utf-8') == '» listo\n'
235
+ seen = []
236
+ a11y.Announcer(seen.append).announce('uno')
237
+ assert seen == ['uno']