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

Jump to bottom

bpo-40280: Detect presence of time.tzset and thread_time clock (GH-31898) #31898

Merged
merged 1 commit into from
Mar 15, 2022
Merged

bpo-40280: Detect presence of time.tzset and thread_time clock (GH-31898) #31898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Lib/test/datetimetester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5856,6 +5856,9 @@ def test_gaps(self):
ldt = tz.fromutc(udt.replace(tzinfo=tz))
self.assertEqual(ldt.fold, 0)

@unittest.skipUnless(
hasattr(time, "tzset"), "time module has no attribute tzset"
)
def test_system_transitions(self):
if ('Riyadh8' in self.zonename or
# From tzdata NEWS file:
Expand Down
3 changes: 3 additions & 0 deletions Lib/test/test_strptime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,9 @@ def test_timezone(self):
"LocaleTime().timezone has duplicate values and "
"time.daylight but timezone value not set to -1")

@unittest.skipUnless(
hasattr(time, "tzset"), "time module has no attribute tzset"
)
def test_bad_timezone(self):
# Explicitly test possibility of bad timezone;
# when time.tzname[0] == time.tzname[1] and time.daylight
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,9 @@ def test_get_clock_info(self):
'perf_counter',
'process_time',
'time',
'thread_time',
]
if hasattr(time, 'thread_time'):
clocks.append('thread_time')

for name in clocks:
with self.subTest(name=name):
Expand Down
4 changes: 3 additions & 1 deletion Modules/timemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,9 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
return 0;
}

#elif defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
#elif defined(HAVE_CLOCK_GETTIME) && \
defined(CLOCK_PROCESS_CPUTIME_ID) && \
!defined(__EMSCRIPTEN__)
#define HAVE_THREAD_TIME

#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability)
Expand Down