diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -9,6 +9,7 @@ import os
 import io
 import platform
 import hashlib
+import getpass
 from base64 import standard_b64encode
 from urllib.request import urlopen, Request, HTTPError
 from urllib.parse import urlparse
@@ -55,6 +56,9 @@ class upload(PyPIRCCommand):
         if not self.password and self.distribution.password:
             self.password = self.distribution.password

+        while not self.password:
+            self.password = getpass.getpass('Password: ')
+
     def run(self):
         if not self.distribution.dist_files:
             msg = "No dist file created in earlier command"