diff --git a/kitty/main.py b/kitty/main.py index f8817f494..da25a1035 100644 --- a/kitty/main.py +++ b/kitty/main.py @@ -222,12 +222,12 @@ def _main(): except Exception: if not is_macos: raise - print('Failed to set locale with LANG:', os.environ.get('LANG'), file=sys.stderr) - os.environ.pop('LANG') + log_error('Failed to set locale with LANG:', os.environ.get('LANG')) + os.environ.pop('LANG', None) try: locale.setlocale(locale.LC_ALL, '') except Exception: - print('Failed to set locale with no LANG, ignoring', file=sys.stderr) + log_error('Failed to set locale with no LANG, ignoring') # Ensure kitty is in PATH rpath = os.path.dirname(kitty_exe()) diff --git a/setup.py b/setup.py index 7a8cf7ccc..a05c25396 100755 --- a/setup.py +++ b/setup.py @@ -658,9 +658,7 @@ Categories=System;TerminalEmulator; NSHighResolutionCapable=True, NSSupportsAutomaticGraphicsSwitching=True, LSApplicationCategoryType='public.app-category.utilities', - # Ensure I/O encoding is always utf-8, see - # https://github.com/kovidgoyal/kitty/issues/724 - LSEnvironment={'KITTY_LAUNCHED_BY_LAUNCH_SERVICES': '1', 'PYTHONIOENCODING': 'utf-8'}, + LSEnvironment={'KITTY_LAUNCHED_BY_LAUNCH_SERVICES': '1'}, ) plistlib.writePlist(pl, 'Info.plist') os.rename('../share', 'Resources')