Rename module to avoid conflisct with stdlib module

src/calibre/db/cli/main.py

@@ -124,7 +124,7 @@ def read_credentials(opts):
     pw = opts.password
     if pw:
         if pw == '<stdin>':
-            from calibre.utils.getpass import getpass
+            from calibre.utils.unicode_getpass import getpass
             pw = getpass.getpass(_('Enter the password: '))
         elif pw.startswith('<f:') and pw.endswith('>'):
             with lopen(pw[3:-1], 'rb') as f:

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(