@@ -39,20 +39,15 @@ extern void _PyIO_Fini(void);
3939# include <TargetConditionals.h>
4040# include <mach-o/loader.h>
4141// The os_log unified logging APIs were introduced in macOS 10.12, iOS 10.0,
42- // tvOS 10.0, and watchOS 3.0;
42+ // tvOS 10.0, and watchOS 3.0; we enable the use of the system logger
43+ // automatically on non-macOS platforms.
4344# if defined(TARGET_OS_IPHONE ) && TARGET_OS_IPHONE
44- # define HAS_APPLE_SYSTEM_LOG 1
45- # elif defined(TARGET_OS_OSX ) && TARGET_OS_OSX
46- # if defined(MAC_OS_X_VERSION_10_12 ) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
47- # define HAS_APPLE_SYSTEM_LOG 1
48- # else
49- # define HAS_APPLE_SYSTEM_LOG 0
50- # endif
45+ # define USE_APPLE_SYSTEM_LOG 1
5146# else
52- # define HAS_APPLE_SYSTEM_LOG 0
47+ # define USE_APPLE_SYSTEM_LOG 0
5348# endif
5449
55- # if HAS_APPLE_SYSTEM_LOG
50+ # if USE_APPLE_SYSTEM_LOG
5651# include <os/log.h>
5752# endif
5853#endif
@@ -91,7 +86,7 @@ static PyStatus add_main_module(PyInterpreterState *interp);
9186static PyStatus init_import_site (void );
9287static PyStatus init_set_builtins_open (void );
9388static PyStatus init_sys_streams (PyThreadState * tstate );
94- #if defined(__APPLE__ ) && HAS_APPLE_SYSTEM_LOG
89+ #if defined(__APPLE__ ) && USE_APPLE_SYSTEM_LOG
9590static PyStatus init_apple_streams (PyThreadState * tstate );
9691#endif
9792static void wait_for_thread_shutdown (PyThreadState * tstate );
@@ -1183,12 +1178,10 @@ init_interp_main(PyThreadState *tstate)
11831178 return status ;
11841179 }
11851180
1186- #if defined(__APPLE__ ) && HAS_APPLE_SYSTEM_LOG
1187- if (config -> use_system_logger ) {
1188- status = init_apple_streams (tstate );
1189- if (_PyStatus_EXCEPTION (status )) {
1190- return status ;
1191- }
1181+ #if defined(__APPLE__ ) && USE_APPLE_SYSTEM_LOG
1182+ status = init_apple_streams (tstate );
1183+ if (_PyStatus_EXCEPTION (status )) {
1184+ return status ;
11921185 }
11931186#endif
11941187
@@ -2516,7 +2509,7 @@ init_sys_streams(PyThreadState *tstate)
25162509 return res ;
25172510}
25182511
2519- #if defined(__APPLE__ ) && HAS_APPLE_SYSTEM_LOG
2512+ #if defined(__APPLE__ ) && USE_APPLE_SYSTEM_LOG
25202513
25212514static PyObject *
25222515apple_log_write_impl (PyObject * self , PyObject * args )
@@ -2577,7 +2570,7 @@ init_apple_streams(PyThreadState *tstate)
25772570 return status ;
25782571}
25792572
2580- #endif // __APPLE__ && HAS_APPLE_SYSTEM_LOG
2573+ #endif // __APPLE__ && USE_APPLE_SYSTEM_LOG
25812574
25822575
25832576static void
0 commit comments