Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix calibre not working when the username is non-ASCII. Fixes #1619056 [Calibre doesn't allow non-ascii usernames](https://bugs.launchpad.net/calibre/+bug/1619056)

Browse Source
This commit is contained in:
Kovid Goyal 2016-09-01 07:47:35 +05:30
parent d6c3a1b1e1
commit 638acca9b3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/utils/ipc/__init__.py
View File

@ -9,7 +9,9 @@ __docformat__ = 'restructuredtext en'
import os, errno import os, errno
from threading import Thread from threading import Thread
from calibre import force_unicode
from calibre.constants import iswindows, get_windows_username, islinux from calibre.constants import iswindows, get_windows_username, islinux
from calibre.utils.filenames import ascii_filename
ADDRESS = VADDRESS = None ADDRESS = VADDRESS = None
@ -32,7 +34,6 @@ def gui_socket_address():
except: except:
user = None user = None
if user: if user:
from calibre.utils.filenames import ascii_filename
user = ascii_filename(user).replace(' ', '_') user = ascii_filename(user).replace(' ', '_')
if user: if user:
ADDRESS += '-' + user[:100] + 'x' ADDRESS += '-' + user[:100] + 'x'
@ -41,7 +42,7 @@ def gui_socket_address():
if not user: if not user:
user = os.path.basename(os.path.expanduser('~')) user = os.path.basename(os.path.expanduser('~'))
if islinux: if islinux:
ADDRESS = (u'\0%s-calibre-gui.socket' % user).encode('ascii') ADDRESS = (u'\0%s-calibre-gui.socket' % ascii_filename(force_unicode(user))).encode('ascii')
else: else:
from tempfile import gettempdir from tempfile import gettempdir
tmp = gettempdir() tmp = gettempdir()
@ -59,7 +60,6 @@ def viewer_socket_address():
except: except:
user = None user = None
if user: if user:
from calibre.utils.filenames import ascii_filename
user = ascii_filename(user).replace(' ', '_') user = ascii_filename(user).replace(' ', '_')
if user: if user:
VADDRESS += '-' + user[:100] + 'x' VADDRESS += '-' + user[:100] + 'x'
@ -68,7 +68,7 @@ def viewer_socket_address():
if not user: if not user:
user = os.path.basename(os.path.expanduser('~')) user = os.path.basename(os.path.expanduser('~'))
if islinux: if islinux:
VADDRESS = (u'\0%s-calibre-viewer.socket' % user).encode('ascii') VADDRESS = (u'\0%s-calibre-viewer.socket' % ascii_filename(force_unicode(user))).encode('ascii')
else: else:
from tempfile import gettempdir from tempfile import gettempdir
tmp = gettempdir() tmp = gettempdir()