From 878986701f999ca5f4b6de7ac7c3f9691af4c1b9 Mon Sep 17 00:00:00 2001
From: Mike Crute <mike@crute.us>
Date: Sat, 30 Sep 2017 20:32:44 +0000
Subject: Move compatible input to py2compat module

---
 pandora/py2compat.py | 9 +++++++++
 pydora/utils.py      | 7 +------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pandora/py2compat.py b/pandora/py2compat.py
index fe45462..b8767ba 100644
--- a/pandora/py2compat.py
+++ b/pandora/py2compat.py
@@ -18,6 +18,15 @@ except ImportError:
             return self.readfp(fp)
 
 
+# Used in pydora
+def input(prompt):
+    try:
+        return raw_input(prompt)
+    except NameError:
+        import builtins
+        return builtins.input(prompt)
+
+
 # Only used in tests
 try:
     from unittest.mock import Mock, MagicMock, call, patch  # noqa: F401
diff --git a/pydora/utils.py b/pydora/utils.py
index 3c48117..9a6d2a1 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -4,6 +4,7 @@ import os
 import sys
 import getpass
 import subprocess
+from pandora.py2compat import input
 
 try:
     import termios
@@ -12,12 +13,6 @@ except ImportError:
     termios = None
 
 
-def input(prompt):
-    try:
-        return raw_input(prompt)
-    except NameError:
-        import builtins
-        return builtins.input(prompt)
 
 
 class Colors(object):
-- 
cgit v1.2.3