diff --git a/minecraft/compat.py b/minecraft/compat.py index 9a06b6d..0614c52 100644 --- a/minecraft/compat.py +++ b/minecraft/compat.py @@ -3,17 +3,4 @@ This module stores code used for making pyCraft compatible with both Python2 and Python3 while using the same codebase. """ -# Raw input -> input shenangians -# example -# > from minecraft.compat import input -# > input("asd") - -# Hi, I'm pylint, and sometimes I act silly, at which point my programmer -# overlords need to correct me. - -# pylint: disable=undefined-variable,redefined-builtin,invalid-name -try: - input = raw_input -except NameError: - input = input -# pylint: enable=undefined-variable,redefined-builtin,invalid-name +# Currently empty, this is sure to grow in time. diff --git a/requirements.txt b/requirements.txt index d75395b..470aeda 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ cryptography requests +six diff --git a/start.py b/start.py index 4cd6c1b..4819a6a 100644 --- a/start.py +++ b/start.py @@ -6,7 +6,7 @@ from minecraft import authentication from minecraft.exceptions import YggdrasilError from minecraft.networking.connection import Connection from minecraft.networking.packets import ChatMessagePacket, ChatPacket -from minecraft.compat import input +from six.moves import input def get_options(): diff --git a/tests/test_compat.py b/tests/test_compat.py index d114ee9..8b88060 100644 --- a/tests/test_compat.py +++ b/tests/test_compat.py @@ -1,8 +1,5 @@ from minecraft import compat # noqa unused-import -import unittest +import unittest # noqa unused-import - -class TestCompatInput(unittest.TestCase): - def test_import_input(self): - from minecraft.compat import input # noqa unused-import +# Currently empty, eventually it should grow. diff --git a/tox.ini b/tox.ini index 4031a79..4d7fa84 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ deps = nose requests cryptography + six [testenv:py27] deps =