Merge pull request sigmavirus24#991 from cclauss/raw_input

sigmavirus24 · web-flow · commit 700aafc8c1dd · 2020-03-31T12:37:36.000-05:00
Remove more instances of raw_input()
diff --git a/docs/source/examples/two_factor_auth.rst b/docs/source/examples/two_factor_auth.rst
@@ -15,20 +15,10 @@ For example:
 
     import github3
 
-    try:
-        # Python 2
-        prompt = raw_input
-    except NameError:
-        # Python 3
-        prompt = input
-
     def my_two_factor_function():
-        code = ''
-        while not code:
-            # The user could accidentally press Enter before being ready,
-            # let's protect them from doing that.
-            code = prompt('Enter 2FA code: ')
-        return code
+        # The user could accidentally press Enter before being ready,
+        # let's protect them from doing that.
+        return input('Enter 2FA code: ').strip() or my_two_factor_function()
 
     g = github3.login('sigmavirus24', 'my_password',
                       two_factor_callback=my_two_factor_function)
diff --git a/example-notebooks/two_factor_authentication.ipynb b/example-notebooks/two_factor_authentication.ipynb
@@ -30,12 +30,7 @@
      "collapsed": false,
      "input": [
       "def callback_handler():\n",
-      "    prompt_str = 'Please enter your 2FA token now: '\n",
-      "    try:\n",
-      "        token = raw_input(prompt_str)\n",
-      "    except NameError:\n",
-      "        token = input(prompt_str)\n",
-      "    return token"
+      "    return input('Please enter your 2FA token now: ').strip() or callback_handler()"
      ],
      "language": "python",
      "metadata": {},
diff --git a/report_issue.py b/report_issue.py
@@ -10,17 +10,10 @@
 except ImportError:
     pass
 
-if hasattr(__builtins__, 'raw_input'):
-    prompt = raw_input
-else:
-    prompt = input
-
 
 def prompt_user(prompt_str):
-    val = ''
-    while not val:
-        val = prompt(prompt_str)
-    return val
+    return input(prompt_str).strip() or prompt_user(prompt_str)
+
 
 if len(sys.argv) > 1 and sys.argv[1] in ('-h', '--help', '-?'):
     print("Usage: {0} [-h|-?|--help]".format(sys.argv[0]))
