summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-08-15 21:55:07 +0600
committerSergey M․ <dstftw@gmail.com>2015-08-15 21:55:07 +0600
commite64b756943440d602dc757f81787cad6aee8f412 (patch)
tree5d216f9c755ff88c62d0d21ea0af47bf703ca943
parent201ea3ee8e392d6c82bb8137b80b4328db40a399 (diff)
downloadyoutube-dl-e64b756943440d602dc757f81787cad6aee8f412.tar.gz
youtube-dl-e64b756943440d602dc757f81787cad6aee8f412.tar.xz
youtube-dl-e64b756943440d602dc757f81787cad6aee8f412.zip
[extractor/common] Interactive TFA code input
-rw-r--r--youtube_dl/extractor/common.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index e2ace827f..65835d257 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -15,6 +15,7 @@ import xml.etree.ElementTree
 from ..compat import (
     compat_cookiejar,
     compat_cookies,
+    compat_getpass,
     compat_HTTPError,
     compat_http_client,
     compat_urllib_error,
@@ -610,7 +611,7 @@ class InfoExtractor(object):
 
         return (username, password)
 
-    def _get_tfa_info(self):
+    def _get_tfa_info(self, note='two-factor verification code'):
         """
         Get the two-factor authentication info
         TODO - asking the user will be required for sms/phone verify
@@ -624,7 +625,7 @@ class InfoExtractor(object):
         if downloader_params.get('twofactor', None) is not None:
             return downloader_params['twofactor']
 
-        return None
+        return compat_getpass('Type %s and press [Return]: ' % note)
 
     # Helper functions for extracting OpenGraph info
     @staticmethod