From 0f95dc49a15b392650342509f14178d3ec65676e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 4 Aug 2017 14:46:41 +0530 Subject: [PATCH] Rename module to avoid conflisct with stdlib module --- src/calibre/db/cli/main.py | 2 +- src/calibre/srv/manage_users_cli.py | 2 +- src/calibre/utils/{getpass.py => unicode_getpass.py} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/calibre/utils/{getpass.py => unicode_getpass.py} (100%) diff --git a/src/calibre/db/cli/main.py b/src/calibre/db/cli/main.py index 04ad63b9f9..8280473d92 100644 --- a/src/calibre/db/cli/main.py +++ b/src/calibre/db/cli/main.py @@ -124,7 +124,7 @@ def read_credentials(opts): pw = opts.password if pw: if pw == '': - from calibre.utils.getpass import getpass + from calibre.utils.unicode_getpass import getpass pw = getpass.getpass(_('Enter the password: ')) elif pw.startswith(''): with lopen(pw[3:-1], 'rb') as f: diff --git a/src/calibre/srv/manage_users_cli.py b/src/calibre/srv/manage_users_cli.py index 4162688d63..e5ed88ab22 100644 --- a/src/calibre/srv/manage_users_cli.py +++ b/src/calibre/srv/manage_users_cli.py @@ -70,7 +70,7 @@ def manage_users_cli(path=None): return get_valid(_('Enter the username'), validate) def get_pass(username): - from calibre.utils.getpass import getpass + from calibre.utils.unicode_getpass import getpass while True: one = getpass( diff --git a/src/calibre/utils/getpass.py b/src/calibre/utils/unicode_getpass.py similarity index 100% rename from src/calibre/utils/getpass.py rename to src/calibre/utils/unicode_getpass.py