diff options
author | Mike Crute <mike@crute.us> | 2017-09-30 20:32:44 +0000 |
---|---|---|
committer | Mike Crute <mike@crute.us> | 2017-09-30 23:09:18 +0000 |
commit | 878986701f999ca5f4b6de7ac7c3f9691af4c1b9 (patch) | |
tree | 3815053a141d2a78d4bfd013ef8c90ca89d27012 | |
parent | cb0230e60ed540b549f391c31b34cca3305d9507 (diff) | |
download | pydora-878986701f999ca5f4b6de7ac7c3f9691af4c1b9.tar.bz2 pydora-878986701f999ca5f4b6de7ac7c3f9691af4c1b9.tar.xz pydora-878986701f999ca5f4b6de7ac7c3f9691af4c1b9.zip |
Move compatible input to py2compat module
-rw-r--r-- | pandora/py2compat.py | 9 | ||||
-rw-r--r-- | 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: | |||
18 | return self.readfp(fp) | 18 | return self.readfp(fp) |
19 | 19 | ||
20 | 20 | ||
21 | # Used in pydora | ||
22 | def input(prompt): | ||
23 | try: | ||
24 | return raw_input(prompt) | ||
25 | except NameError: | ||
26 | import builtins | ||
27 | return builtins.input(prompt) | ||
28 | |||
29 | |||
21 | # Only used in tests | 30 | # Only used in tests |
22 | try: | 31 | try: |
23 | from unittest.mock import Mock, MagicMock, call, patch # noqa: F401 | 32 | 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 | |||
4 | import sys | 4 | import sys |
5 | import getpass | 5 | import getpass |
6 | import subprocess | 6 | import subprocess |
7 | from pandora.py2compat import input | ||
7 | 8 | ||
8 | try: | 9 | try: |
9 | import termios | 10 | import termios |
@@ -12,12 +13,6 @@ except ImportError: | |||
12 | termios = None | 13 | termios = None |
13 | 14 | ||
14 | 15 | ||
15 | def input(prompt): | ||
16 | try: | ||
17 | return raw_input(prompt) | ||
18 | except NameError: | ||
19 | import builtins | ||
20 | return builtins.input(prompt) | ||
21 | 16 | ||
22 | 17 | ||
23 | class Colors(object): | 18 | class Colors(object): |