Skip to content

Fix for incorrect LC_CTYPE sent from OS X via SSH #1

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

Open
vasilykolosov wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix for incorrect LC_CTYPE sent from OS X via SSH #1

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d5eeed
Added .gitignore
Feb 28, 2013
c41cf7b
Added a fix for crash when incorrect LC_CTYPE is sent via ssh from Ma…
Feb 28, 2013
07e243c
Handle deriving locale from OS X SSH remote client in a safer way.
Feb 28, 2013
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*pyc
fabfile.py
*swp
12 changes: 11 additions & 1 deletion command-not-found
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ try:
import gettext
import locale
import sys
import os
from optparse import OptionParser

from CommandNotFound.util import crash_guard
Expand All @@ -26,7 +27,16 @@ def enable_i18n():
if sys.version < '3':
kwargs["unicode"] = True
cnf.install(**kwargs)
locale.setlocale(locale.LC_ALL, '')

try:
locale.setlocale(locale.LC_ALL, '')
except locale.Error as exc:
# Fixing the case when remote system sends incorrect LC_CTYPE via SSH
if os.environ['LC_CTYPE'] == 'UTF-8': # Mac OS X
# Set the locale based on LANG environmental variable
locale.setlocale(locale.LC_ALL, os.environ['LANG'].split('.'))

@zyga zyga Feb 28, 2013

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do os.environ.get("LANG", "some default") to be extra paranoid.

Why do you split() it on the '.' character? That will return an array, did you want to get the first component of that?

@vasilykolosov vasilykolosov Feb 28, 2013

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do os.environ.get("LANG", "some default") to be extra paranoid.

Makes sense

Why do you split() it on the '.' character? That will return an array, did you want to get the first component of that?

No, but you're right — there's no need to do a split. I was a bit confused by example in documentation, where setlocale is called with a tuple ("en_us", "UTF-8") as a second argument, but a string is okay too.

Fixing that in next commit.

@zyga zyga Feb 28, 2013

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the spec says you can put some kind of expressions there, like en_US.UTF-8;fr_FR.UTF-8 for example, I think it's best to minimize our need to parse that

else:
raise exc


def fix_sys_argv(encoding=None):
Expand Down