KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert change to set PYTHONIOENCODING on macOS

Browse Source 
It is not needed in python 3.7 as the POSIX locale is
now UTF-8 by default
This commit is contained in:
Kovid Goyal 2018-07-15 12:19:48 +05:30
parent 9918397190
commit 3d0da77c80
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kitty/main.py
View File

@ -222,12 +222,12 @@ def _main():
except Exception: except Exception:
if not is_macos: if not is_macos:
raise raise
print('Failed to set locale with LANG:', os.environ.get('LANG'), file=sys.stderr) log_error('Failed to set locale with LANG:', os.environ.get('LANG'))
os.environ.pop('LANG') os.environ.pop('LANG', None)
try: try:
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
except Exception: 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 # Ensure kitty is in PATH
rpath = os.path.dirname(kitty_exe()) rpath = os.path.dirname(kitty_exe())

4
setup.py
View File

@ -658,9 +658,7 @@ Categories=System;TerminalEmulator;
NSHighResolutionCapable=True, NSHighResolutionCapable=True,
NSSupportsAutomaticGraphicsSwitching=True, NSSupportsAutomaticGraphicsSwitching=True,
LSApplicationCategoryType='public.app-category.utilities', LSApplicationCategoryType='public.app-category.utilities',
# Ensure I/O encoding is always utf-8, see LSEnvironment={'KITTY_LAUNCHED_BY_LAUNCH_SERVICES': '1'},
# https://github.com/kovidgoyal/kitty/issues/724
LSEnvironment={'KITTY_LAUNCHED_BY_LAUNCH_SERVICES': '1', 'PYTHONIOENCODING': 'utf-8'},
) )
plistlib.writePlist(pl, 'Info.plist') plistlib.writePlist(pl, 'Info.plist')
os.rename('../share', 'Resources') os.rename('../share', 'Resources')