Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Pack property names to match CSS #3033

Merged
merged 17 commits into from
Dec 15, 2024
Merged

Updated Pack property names to match CSS #3033

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b8d0efb
Changed padding to margin and alignment to align_items
HalfWhitt Dec 9, 2024
52ecf6a
Added changenote
HalfWhitt Dec 9, 2024
e71b659
Fixes to coverage and testbed
HalfWhitt Dec 9, 2024
a919c45
More testbed fixes
HalfWhitt Dec 9, 2024
7edbccd
More GTK testbed fixes
HalfWhitt Dec 9, 2024
97f8d6c
Yet more GTK testbed fixes
HalfWhitt Dec 9, 2024
e2f3628
Hopefully last GTK fix
HalfWhitt Dec 9, 2024
e84de89
Documentation fixes
HalfWhitt Dec 11, 2024
5e1af52
Fixed align_items values, added backwards compatibilty for alignment …
HalfWhitt Dec 12, 2024
a185b13
Consistently name text_align everywhere
HalfWhitt Dec 12, 2024
097db43
Slightly easier-to-read __getattribute__
HalfWhitt Dec 12, 2024
7a681cf
Updated changenote, and removed alignment doc section I'd missed
HalfWhitt Dec 12, 2024
9fc4d69
to_toga -> toga, marked ALIGNMENT_CHOICES deprecated
HalfWhitt Dec 13, 2024
146bb77
Simplify __getattribute__ recursion avoidance
mhsmith Dec 15, 2024
aedc7e1
Remove `to_` prefix from Android conversion function name
mhsmith Dec 15, 2024
23f32f0
Update tests for bracket notation workaround
mhsmith Dec 15, 2024
53112c6
Make docs consistently use lower-case names
mhsmith Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions core/tests/style/pack/test_deprecated_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ def delitem(obj, name):
@pytest.mark.parametrize(
"old_name, new_name, value, default",
[
# Travertino 0.3.0 doesn't support accessing a directional property via bracket
# notation.
# ("padding", "margin", (5, 5, 5, 5), (0, 0, 0, 0)),
("padding", "margin", (5, 5, 5, 5), (0, 0, 0, 0)),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, it hadn't even occurred to me that I'd made this work. Nice catch! 🤣

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually wait, my attempt to deduplicate logic (by having __getitem__ call __getattribute__) had the happy accident of letting bracket notation access padding, but only because it entirely bypasses BaseStyle.__getitem__, which verifies valid property names. Now you can set style['bogus-name'] and it won't complain.

This mechanism is currently enforced in Travertino's tests, but not Toga's, so I missed it. I'll make a fix and add a test.

("padding_top", "margin_top", 5, 0),
("padding_right", "margin_right", 5, 0),
("padding_bottom", "margin_bottom", 5, 0),
Expand Down Expand Up @@ -70,21 +68,6 @@ def test_deprecated_properties(
assert get_fn(style, old_name) == default


def test_padding_margin():
"""Padding aliases margin (but can't be checked with bracket notation)."""
# Set the old name, then check the new name.
style = Pack()
with pytest.warns(DeprecationWarning):
style.padding = (5, 5, 5, 5)
assert style.margin == (5, 5, 5, 5)

# Set the new name, then check the old name.
style = Pack()
style.margin = (5, 5, 5, 5)
with pytest.warns(DeprecationWarning):
assert style.padding == (5, 5, 5, 5)


@pytest.mark.parametrize(
"direction, text_direction, alignment, align_items",
[
Expand Down