-

cool-RR · cool-RR · commit b46b9e65c3bc · 2013-09-18T23:14:50.000+03:00
diff --git a/source_py2/python_toolbox/sequence_tools.py b/source_py2/python_toolbox/sequence_tools.py
@@ -7,7 +7,6 @@
 import types
 import itertools
 
-from python_toolbox.nifty_collections import Counter
 from python_toolbox import math_tools
 
 
@@ -22,7 +21,7 @@ def are_equal_regardless_of_order(seq1, seq2):
 
     Currently will fail for items that have problems with comparing.
     '''
-    return Counter(seq1) == Counter(seq2)
+    return collections.Counter(seq1) == collections.Counter(seq2)
 
 
 def flatten(iterable):
@@ -281,7 +280,7 @@ def get_recurrences(sequence):
     The values of the dict are the numbers of repititions of each item.    
     '''
     return {item: n_recurrences for item, n_recurrences in
-            Counter(sequence).most_common() if n_recurrences >= 2}
+            collections.Counter(sequence).most_common() if n_recurrences >= 2}
     
 ### Not using now, might want in future:
 
diff --git a/source_py2/python_toolbox/sys_tools.py b/source_py2/python_toolbox/sys_tools.py
@@ -4,9 +4,8 @@
 '''Defines various `sys`-related tools.'''
 
 
-
 import sys
-import cStringIO
+import cStringIO as string_io_module
 
 from python_toolbox.context_management import (ContextManager,
                                                     BlankContextManager)
@@ -30,7 +29,7 @@ class OutputCapturer(ContextManager):
     captured.
     '''
     def __init__(self, stdout=True, stderr=True):
-        self.string_io = cStringIO.StringIO()
+        self.string_io = string_io_module.StringIO()
         
         if stdout:
             self._stdout_temp_setter = \
@@ -46,9 +45,8 @@ def __init__(self, stdout=True, stderr=True):
         
     def manage_context(self):
         '''Manage the `OutputCapturer`'s context.'''
-        with self._stdout_temp_setter:
-            with self._stderr_temp_setter:
-                yield self
+        with self._stdout_temp_setter, self._stderr_temp_setter:
+            yield self
         
     output = property(lambda self: self.string_io.getvalue(),
                       doc='''The string of output that was captured.''')
diff --git a/source_py2/python_toolbox/version_info.py b/source_py2/python_toolbox/version_info.py
@@ -57,7 +57,7 @@ def _asdict(self):
         '''
         Return a new `OrderedDict` which maps field names to their values.
         '''
-        return OrderedDict(zip(self._fields, self)) 
+        return OrderedDict(zip(self._fields, self))
 
     
     def _replace(self, **kwargs):
diff --git a/source_py2/python_toolbox/zip_tools.py b/source_py2/python_toolbox/zip_tools.py
@@ -34,9 +34,8 @@ def zip_folder(folder, zip_path, ignored_patterns=()):
     zip_name = os.path.splitext(os.path.split(zip_path)[1])[0]
     source_folder_name = os.path.split(source_folder)[1]
             
-    with contextlib.closing(
-        zip_module.ZipFile(zip_path, 'w', zip_module.ZIP_DEFLATED)
-        ) as zip_file:
+    with zip_module.ZipFile(zip_path, 'w', zip_module.ZIP_DEFLATED) \
+                                                                   as zip_file:
         
         for root, subfolders, files in os.walk(source_folder):
             
@@ -63,8 +62,8 @@ def zip_in_memory(files):
     Files should be given as tuples of `(file_path, file_contents)`.
     '''
     zip_stream = string_io_module.StringIO()
-    with contextlib.closing(zip_module.ZipFile(zip_stream, mode='w',
-                            compression=zip_module.ZIP_DEFLATED)) as zip_file:
+    with zip_module.ZipFile(zip_stream, mode='w',
+                            compression=zip_module.ZIP_DEFLATED) as zip_file:
         assert isinstance(zip_file, zip_module.ZipFile)
         for file_name, file_data in files:
             zip_file.writestr(file_name, file_data)
@@ -78,8 +77,8 @@ def unzip_in_memory(zip_archive):
     Files are returned as tuples of `(file_path, file_contents)`.
     '''    
     zip_stream = string_io_module.StringIO(zip_archive)
-    with contextlib.closing(zip_module.ZipFile(zip_stream, mode='r',
-                            compression=zip_module.ZIP_DEFLATED)) as zip_file:
+    with zip_module.ZipFile(zip_stream, mode='r',
+                            compression=zip_module.ZIP_DEFLATED) as zip_file:
         assert isinstance(zip_file, zip_module.ZipFile)
         return tuple((file_name, zip_file.read(file_name)) for file_name in
                      zip_file.namelist())
diff --git a/source_py3/python_toolbox/queue_tools.py b/source_py3/python_toolbox/queue_tools.py
@@ -4,7 +4,6 @@
 '''Defines various functions for working with queues.'''
 
 
-
 import queue as queue_module
 import sys
 
diff --git a/source_py3/python_toolbox/sys_tools.py b/source_py3/python_toolbox/sys_tools.py
@@ -4,8 +4,6 @@
 '''Defines various `sys`-related tools.'''
 
 
-
-
 import sys
 import io
 
diff --git a/source_py3/python_toolbox/temp_file_tools.py b/source_py3/python_toolbox/temp_file_tools.py
@@ -4,7 +4,6 @@
 '''Defines various tools related to temporary files.'''
 
 
-
 import tempfile
 import shutil
 import os
diff --git a/source_py3/python_toolbox/version_info.py b/source_py3/python_toolbox/version_info.py
@@ -57,18 +57,18 @@ def _asdict(self):
         '''
         Return a new `OrderedDict` which maps field names to their values.
         '''
-        return OrderedDict(list(zip(self._fields, self))) 
+        return OrderedDict(zip(self._fields, self))
 
     
     def _replace(self, **kwargs):
         '''
         Make a `VersionInfo` object replacing specified fields with new values.
         '''
         result = \
-            self._make(list(map(kwargs.pop, ('major', 'minor', 'micro', 'modifier'),
-                           self)))
+            self._make(map(kwargs.pop, ('major', 'minor', 'micro', 'modifier'),
+                           self))
         if kwargs:
-            raise ValueError('Got unexpected field names: %r' % list(kwargs.keys()))
+            raise ValueError('Got unexpected field names: %r' % kwargs.keys())
         return result 
     
     
diff --git a/source_py3/python_toolbox/zip_tools.py b/source_py3/python_toolbox/zip_tools.py
@@ -4,7 +4,6 @@
 '''Various zip-related tools.'''
 
 
-
 import contextlib
 import zipfile as zip_module
 import os.path
