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

Windows: Fix calibre-server --manage-users not working correctly

Browse Source 
Apparently when running in the windows command prompy raw_input()
returns a trailing carriage return
This commit is contained in:
Kovid Goyal 2019-07-17 14:51:06 +05:30
parent 23bc346ce8
commit 78f1896c69
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/srv/manage_users_cli.py
View File

@ -8,7 +8,7 @@ import sys
from functools import partial from functools import partial
from calibre import prints from calibre import prints
from calibre.constants import preferred_encoding from calibre.constants import preferred_encoding, iswindows
from polyglot.builtins import iteritems, raw_input, filter, unicode_type from polyglot.builtins import iteritems, raw_input, filter, unicode_type
# Manage users CLI {{{ # Manage users CLI {{{
@ -24,6 +24,9 @@ def manage_users_cli(path=None):
ans = raw_input() ans = raw_input()
if isinstance(ans, bytes): if isinstance(ans, bytes):
ans = ans.decode(enc) ans = ans.decode(enc)
if iswindows:
# https://bugs.python.org/issue11272
ans = ans.rstrip('\r')
return ans return ans
def choice( def choice(