1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: YOKOTA Hiroshi <yokota.hgml@gmail.com>
Date: Fri, 5 Dec 2025 15:34:17 +0900
Subject: No need to use tzdata module on Unix
Forwarded: https://github.com/kovidgoyal/calibre/pull/2920
Windows uses tzdata module for zoneinfo, but Unix uses system's zoneinfo
data.
See also:
https://docs.python.org/3/library/zoneinfo.html#module-zoneinfo
---
pyproject.toml | 2 +-
src/calibre/test_build.py | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 4c9e4b3..23ec7c6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ dependencies = [
"PyQt6_WebEngine == 6.8.0",
"MacFSEvents == 0.8.4; sys_platform == 'darwin'",
"xxhash == 3.3.0",
- "tzdata == 2025.2",
+ "tzdata == 2025.2; platform_system == 'Windows'",
"tzlocal == 5.3.1",
]
diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
index 9773188..dc62e5a 100644
--- a/src/calibre/test_build.py
+++ b/src/calibre/test_build.py
@@ -86,9 +86,14 @@ class BuildTest(unittest.TestCase):
del CHMFile, chmlib
def test_tzdata(self):
- import tzdata
- import tzlocal
- del tzlocal, tzdata
+ if iswindows:
+ # Windows uses tzdata module for zoneinfo
+ import tzdata
+ import tzlocal
+ del tzlocal, tzdata
+ else:
+ import tzlocal
+ del tzlocal
def test_chardet(self):
from calibre_extensions.uchardet import detect
|
