get rid of all use of the six module now that we are py3-only

Author: radix

effect/_dispatcher.py

@@ -4,8 +4,6 @@
 
 import attr
 
-from six.moves import filter
-
 
 @attr.s
 class TypeDispatcher(object):

effect/_sync.py

@@ -4,7 +4,6 @@
 Tools for dealing with Effects synchronously.
 """
 
-import six
 import sys
 
 from ._base import perform

effect/io.py

@@ -6,7 +6,6 @@
 
 from __future__ import print_function
 import attr
-from six.moves import input
 
 from . import sync_performer, TypeDispatcher
 
@@ -32,8 +31,7 @@ def perform_display_print(dispatcher, intent):
 @sync_performer
 def perform_get_input_raw_input(dispatcher, intent):
     """
-    Perform a :obj:`Prompt` intent by using ``raw_input`` (or ``input`` on
-    Python 3).
+    Perform a :obj:`Prompt` intent by using ``input``.
     """
     return input(intent.prompt)
 

effect/retry.py

@@ -1,7 +1,5 @@
 """Retrying effects."""
 
-import six
-
 from functools import partial
 
 

effect/test_do.py

@@ -4,8 +4,6 @@
 from py.test import raises as raises
 from py.test import mark
 
-import six
-
 from . import (
     ComposedDispatcher, Constant, Effect, Error, TypeDispatcher,
     base_dispatcher, sync_perform, sync_performer)
@@ -170,7 +168,6 @@ def f():
             perf(eff)
 
 
-@mark.skipif(not six.PY3, reason="Testing a Py3-specific feature")
 def test_py3_return():
     """The `return x` syntax in Py3 sets the result of the Effect to `x`."""
     from effect._test_do_py3 import py3_generator_with_return

effect/test_intents.py

@@ -2,8 +2,6 @@
 
 from functools import partial
 
-import six
-
 from testtools import TestCase
 from testtools.matchers import Equals, MatchesListwise
 

effect/test_io.py

@@ -13,6 +13,6 @@ def test_perform_display_print(capsys):
 def test_perform_get_input_raw_input(monkeypatch):
     """The stdio dispatcher has a performer that reads input."""
     monkeypatch.setattr(
-        'effect.io.input',
+        'builtins.input',
         lambda p: 'my name' if p == '> ' else 'boo')
     assert sync_perform(stdio_dispatcher, Effect(Prompt('> '))) == 'my name'

effect/test_parallel_performers.py

@@ -2,8 +2,6 @@
 
 import attr
 
-import six
-
 from testtools.matchers import MatchesStructure, Equals
 
 from . import Effect, raise_

effect/testing.py

@@ -17,7 +17,6 @@
 from ._sync import NotSynchronousError, sync_perform, sync_performer
 from ._intents import Constant, Error, Func, ParallelEffects, base_dispatcher
 
-import six
 
 __all__ = [
     'perform_sequence',

setup.py

@@ -14,5 +14,5 @@
         'Programming Language :: Python :: 3',
         ],
     packages=['effect'],
-    install_requires=['six', 'attrs'],
+    install_requires=['attrs'],
 )