Skip to content

Commit 405c62a

Browse files
committed
datetime test lint
Clean up some test and variable names and extract some common value for readability
1 parent 562f6a2 commit 405c62a

File tree

1 file changed

+61
-55
lines changed

1 file changed

+61
-55
lines changed

python/ipywidgets/ipywidgets/widgets/tests/test_widget_datetime.py

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -14,98 +14,104 @@
1414
from ..widget_datetime import DatetimePicker
1515

1616

17+
dt_1442 = datetime.datetime(1442, 1, 1, tzinfo=pytz.utc)
18+
dt_1664 = datetime.datetime(1664, 1, 1, tzinfo=pytz.utc)
19+
dt_1994 = datetime.datetime(1994, 1, 1, tzinfo=pytz.utc)
20+
dt_2002 = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
21+
dt_2056 = datetime.datetime(2056, 1, 1, tzinfo=pytz.utc)
22+
1723
def test_time_creation_blank():
1824
w = DatetimePicker()
1925
assert w.value is None
2026

2127

2228
def test_time_creation_value():
23-
t = datetime.datetime.now(pytz.utc)
24-
w = DatetimePicker(value=t)
25-
assert w.value is t
29+
dt = datetime.datetime.now(pytz.utc)
30+
w = DatetimePicker(value=dt)
31+
assert w.value is dt
2632

2733

28-
def test_time_validate_value_none():
29-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
30-
t_min = datetime.datetime(1442, 1, 1, tzinfo=pytz.utc)
31-
t_max = datetime.datetime(2056, 1, 1, tzinfo=pytz.utc)
32-
w = DatetimePicker(value=t, min=t_min, max=t_max)
34+
def test_datetime_validate_value_none():
35+
dt = dt_2002
36+
dt_min = dt_1442
37+
dt_max = dt_2056
38+
w = DatetimePicker(value=dt, min=dt_min, max=dt_max)
3339
w.value = None
3440
assert w.value is None
3541

3642

37-
def test_time_validate_value_vs_min():
38-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
39-
t_min = datetime.datetime(2019, 1, 1, tzinfo=pytz.utc)
40-
t_max = datetime.datetime(2056, 1, 1, tzinfo=pytz.utc)
41-
w = DatetimePicker(min=t_min, max=t_max)
42-
w.value = t
43+
def test_datetime_validate_value_vs_min():
44+
dt = dt_2002
45+
dt_min = datetime.datetime(2019, 1, 1, tzinfo=pytz.utc)
46+
dt_max = dt_2056
47+
w = DatetimePicker(min=dt_min, max=dt_max)
48+
w.value = dt
4349
assert w.value.year == 2019
4450

4551

46-
def test_time_validate_value_vs_max():
47-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
48-
t_min = datetime.datetime(1664, 1, 1, tzinfo=pytz.utc)
49-
t_max = datetime.datetime(1994, 1, 1, tzinfo=pytz.utc)
50-
w = DatetimePicker(min=t_min, max=t_max)
51-
w.value = t
52+
def test_datetime_validate_value_vs_max():
53+
dt = dt_2002
54+
dt_min = dt_1664
55+
dt_max = dt_1994
56+
w = DatetimePicker(min=dt_min, max=dt_max)
57+
w.value = dt
5258
assert w.value.year == 1994
5359

5460

55-
def test_time_validate_min_vs_value():
56-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
57-
t_min = datetime.datetime(2019, 1, 1, tzinfo=pytz.utc)
58-
t_max = datetime.datetime(2056, 1, 1, tzinfo=pytz.utc)
59-
w = DatetimePicker(value=t, max=t_max)
60-
w.min = t_min
61+
def test_datetime_validate_min_vs_value():
62+
dt = dt_2002
63+
dt_min = datetime.datetime(2019, 1, 1, tzinfo=pytz.utc)
64+
dt_max = dt_2056
65+
w = DatetimePicker(value=dt, max=dt_max)
66+
w.min = dt_min
6167
assert w.value.year == 2019
6268

6369

64-
def test_time_validate_min_vs_max():
65-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
66-
t_min = datetime.datetime(2112, 1, 1, tzinfo=pytz.utc)
67-
t_max = datetime.datetime(2056, 1, 1, tzinfo=pytz.utc)
68-
w = DatetimePicker(value=t, max=t_max)
70+
def test_datetime_validate_min_vs_max():
71+
dt = dt_2002
72+
dt_min = datetime.datetime(2112, 1, 1, tzinfo=pytz.utc)
73+
dt_max = dt_2056
74+
w = DatetimePicker(value=dt, max=dt_max)
6975
with pytest.raises(TraitError):
70-
w.min = t_min
76+
w.min = dt_min
7177

7278

73-
def test_time_validate_max_vs_value():
74-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
75-
t_min = datetime.datetime(1664, 1, 1, tzinfo=pytz.utc)
76-
t_max = datetime.datetime(1994, 1, 1, tzinfo=pytz.utc)
77-
w = DatetimePicker(value=t, min=t_min)
78-
w.max = t_max
79+
def test_datetime_validate_max_vs_value():
80+
dt = dt_2002
81+
dt_min = dt_1664
82+
dt_max = dt_1994
83+
w = DatetimePicker(value=dt, min=dt_min)
84+
w.max = dt_max
7985
assert w.value.year == 1994
8086

8187

82-
def test_time_validate_max_vs_min():
83-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
84-
t_min = datetime.datetime(1664, 1, 1, tzinfo=pytz.utc)
85-
t_max = datetime.datetime(1337, 1, 1, tzinfo=pytz.utc)
86-
w = DatetimePicker(value=t, min=t_min)
88+
def test_datetime_validate_max_vs_min():
89+
dt = dt_2002
90+
dt_min = dt_1664
91+
dt_max = datetime.datetime(1337, 1, 1, tzinfo=pytz.utc)
92+
w = DatetimePicker(value=dt, min=dt_min)
8793
with pytest.raises(TraitError):
88-
w.max = t_max
94+
w.max = dt_max
8995

9096

91-
def test_time_validate_naive():
92-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=pytz.utc)
93-
t_min = datetime.datetime(1442, 1, 1, tzinfo=pytz.utc)
94-
t_max = datetime.datetime(2056, 1, 1, tzinfo=pytz.utc)
97+
def test_datetime_validate_naive():
98+
dt = dt_2002
99+
dt_min = dt_1442
100+
dt_max = dt_2056
95101

96-
w = DatetimePicker(value=t, min=t_min, max=t_max)
102+
w = DatetimePicker(value=dt, min=dt_min, max=dt_max)
97103
with pytest.raises(TraitError):
98-
w.max = t_max.replace(tzinfo=None)
104+
w.max = dt_max.replace(tzinfo=None)
99105
with pytest.raises(TraitError):
100-
w.min = t_min.replace(tzinfo=None)
106+
w.min = dt_min.replace(tzinfo=None)
101107
with pytest.raises(TraitError):
102-
w.value = t.replace(tzinfo=None)
108+
w.value = dt.replace(tzinfo=None)
103109

104110

105111
def test_datetime_tzinfo():
106112
tz = pytz.timezone('Australia/Sydney')
107-
t = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=tz)
108-
w = DatetimePicker(value=t)
109-
assert w.value == t
113+
dt = datetime.datetime(2002, 2, 20, 13, 37, 42, 7, tzinfo=tz)
114+
w = DatetimePicker(value=dt)
115+
assert w.value == dt
110116
# tzinfo only changes upon input from user
111117
assert w.value.tzinfo == tz

0 commit comments

Comments
 (0)