Manually merging to py2

cool-RR · cool-RR · commit 3b460b6095e7 · 2016-06-07T14:30:48.000+03:00
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
@@ -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_reentrant, ContextManager,
                                                ContextManagerType)
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,15 +115,15 @@ 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):
-        # Doing a very weak test of chmod because not everything is supported
-        # on Windows.
-        assert (liberal_temp_folder.stat().st_mode & 0o777) > \
-                              (conservative_temp_folder.stat().st_mode & 0o777)
-        
-        # Making `conservative_temp_folder` writeable again so it could be
-        # deleted in cleanup:
-        conservative_temp_folder.chmod(0o777)
+    with create_temp_folder(chmod=0o777) as liberal_temp_folder:
+        with 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) > \
+                                  (conservative_temp_folder.stat().st_mode & 0o777)
+            
+            # Making `conservative_temp_folder` writeable again so it could be
+            # deleted in cleanup:
+            conservative_temp_folder.chmod(0o777)
         
 
