Manually merging to py2

cool-RR · cool-RR · commit e67e41e117cf · 2016-06-07T14:20:02.000+03:00
diff --git a/source_py2/test_python_toolbox/test_context_management/test_abstractness.py b/source_py2/test_python_toolbox/test_context_management/test_abstractness.py
@@ -62,7 +62,8 @@ def __enter__(self):
         def __exit__(self, exc_type, exc_value, exc_traceback):
             pass
     AnotherContextManager()
-    def test_isinstance_and_issubclass():
+
+def test_isinstance_and_issubclass():
     class Woof(object):
         def __enter__(self):
             return self
diff --git a/source_py2/test_python_toolbox/test_context_management/test_as_idempotent.py b/source_py2/test_python_toolbox/test_context_management/test_as_idempotent.py
@@ -1,7 +1,7 @@
 # Copyright 2009-2015 Ram Rachum.
 # This program is distributed under the MIT license.
 
-import queue as queue_module
+import Queue as queue_module
 
 from python_toolbox.context_management import (as_idempotent, ContextManager,
                                                ContextManagerType)
diff --git a/source_py2/test_python_toolbox/test_context_management/test_as_reentrant.py b/source_py2/test_python_toolbox/test_context_management/test_as_reentrant.py
@@ -110,7 +110,7 @@ def __exit__(self, exc_type, exc_value, exc_traceback):
                 my_set.add(6)
             my_set.add(7)
         my_set.add(8)
-    assert my_set == {0, 1, 2, 3, 4}
+    assert my_set == set((0, 1, 2, 3, 4))
         
 
         
diff --git a/source_py2/test_python_toolbox/test_math_tools/test_cute_round.py b/source_py2/test_python_toolbox/test_math_tools/test_cute_round.py
@@ -14,8 +14,8 @@ def almost_equals(x, y):
 
 class CuteRoundTestCase(cute_testing.TestCase):
     def test_closest_or_down(self):
-        full_arg_spec = inspect.getfullargspec(cute_round)
-        assert RoundMode.CLOSEST_OR_DOWN in full_arg_spec.defaults
+        arg_spec = inspect.getargspec(cute_round)
+        assert RoundMode.CLOSEST_OR_DOWN in arg_spec.defaults
                                                           
         assert almost_equals(cute_round(7.456), 7)
         assert almost_equals(cute_round(7.654), 8)
diff --git a/source_py2/test_python_toolbox/test_temp_file_tools/test_create_temp_folder.py b/source_py2/test_python_toolbox/test_temp_file_tools/test_create_temp_folder.py
@@ -115,8 +115,8 @@ def test_parent_folder():
             assert str(tf2).startswith(str(tf1))
     
 def test_chmod():
-    with create_temp_folder(chmod=0o777) as liberal_temp_folder, \
-                   create_temp_folder(chmod=0o000) as conservative_temp_folder:
+    with (create_temp_folder(chmod=0o777) as liberal_temp_folder,
+                   create_temp_folder(chmod=0o000) as conservative_temp_folder):
         # Doing a very weak test of chmod because not everything is supported
         # on Windows.
         assert (liberal_temp_folder.stat().st_mode & 0o777) > \
