-

cool-RR · cool-RR · commit 5f72728df907 · 2014-10-11T14:26:40.000+03:00
diff --git a/source_py3/python_toolbox/address_tools/__init__.py b/source_py3/python_toolbox/address_tools/__init__.py
@@ -1,7 +1,7 @@
 # Copyright 2009-2014 Ram Rachum.
 # This program is distributed under the MIT license.
 
-'''
+r'''
 Module for manipulating Python addresses.
 
 Use `resolve` to turn a string description into an object, and `describe` to
diff --git a/source_py3/python_toolbox/address_tools/object_to_string.py b/source_py3/python_toolbox/address_tools/object_to_string.py
@@ -150,7 +150,7 @@ def get_address(obj, shorten=False, root=None, namespace={}):
         address = '.'.join((obj.__module__, obj.__self__.__class__.__name__,
                             obj.__name__))
     else:
-        address= '.'.join((obj.__module__, obj.__name__))
+        address = '.'.join((obj.__module__, obj.__name__))
 
     # Now our attempt at an address is in `address`. Let's `try` to resolve
     # that address to see if it's right and we get the same object:        
diff --git a/source_py3/python_toolbox/address_tools/string_to_object.py b/source_py3/python_toolbox/address_tools/string_to_object.py
@@ -13,7 +13,7 @@
 
 
 def resolve(string, root=None, namespace={}):
-    '''
+    r'''
     Resolve an address into a Python object. A more powerful version of `eval`.
     
     The main advantage it has over `eval` is that it automatically imports
diff --git a/source_py3/python_toolbox/binary_search/functions.py b/source_py3/python_toolbox/binary_search/functions.py
@@ -89,10 +89,10 @@ def _binary_search_both(sequence, value,
         medium = (low + high) // 2
         medium_value = get(medium)
         if medium_value > value:
-            high = medium; high_value = medium_value
+            high, high_value = medium, medium_value
             continue
         if medium_value < value:
-            low = medium; low_value = medium_value
+            low, low_value = medium, medium_value
             continue
         if medium_value == value:
             return (sequence[medium], sequence[medium])
diff --git a/source_py3/python_toolbox/caching/decorators.py b/source_py3/python_toolbox/caching/decorators.py
@@ -8,7 +8,6 @@
 '''
 # todo: examine thread-safety
 
-import functools
 import datetime as datetime_module
 
 from python_toolbox import misc_tools
diff --git a/source_py3/python_toolbox/combi/chain_space.py b/source_py3/python_toolbox/combi/chain_space.py
@@ -1,23 +1,12 @@
 import collections
-import types
-import sys
-import math
-import numbers
 
-from python_toolbox import misc_tools
 from python_toolbox import binary_search
-from python_toolbox import dict_tools
 from python_toolbox import nifty_collections
 from python_toolbox import caching
 
-from python_toolbox import math_tools
 from python_toolbox import sequence_tools
-from python_toolbox import cute_iter_tools
 from python_toolbox import nifty_collections
 
-from . import misc
-from python_toolbox import misc_tools
-
 infinity = float('inf')
 
 
diff --git a/source_py3/python_toolbox/combi/map_space.py b/source_py3/python_toolbox/combi/map_space.py
@@ -1,22 +1,8 @@
 import collections
-import types
-import sys
-import math
-import numbers
 
-from python_toolbox import misc_tools
-from python_toolbox import binary_search
-from python_toolbox import dict_tools
 from python_toolbox import nifty_collections
 from python_toolbox import caching
-
-from python_toolbox import math_tools
 from python_toolbox import sequence_tools
-from python_toolbox import cute_iter_tools
-from python_toolbox import nifty_collections
-from python_toolbox import misc_tools
-
-from . import misc
 
 infinity = float('inf')
 
diff --git a/source_py3/python_toolbox/combi/misc.py b/source_py3/python_toolbox/combi/misc.py
@@ -1,15 +1,6 @@
-import collections
-import types
-import sys
 import math
-import numbers
-
-from python_toolbox import dict_tools
-from python_toolbox import nifty_collections
-from python_toolbox import caching
 
 from python_toolbox import math_tools
-from python_toolbox import sequence_tools
 from python_toolbox import cute_iter_tools
 
 infinity = float('inf')
@@ -20,6 +11,7 @@ class MISSING_ELEMENT:
         
         
 def get_short_factorial_string(number, minus_one=False):
+    '''blocktotodoc'''
     assert number >= 0 and \
                     isinstance(number, math_tools.PossiblyInfiniteIntegral)
     if number == infinity:
diff --git a/source_py3/python_toolbox/combi/product_space.py b/source_py3/python_toolbox/combi/product_space.py
@@ -1,25 +1,7 @@
 import collections
-import types
-import sys
-import math
-import numbers
-
-from python_toolbox import misc_tools
-from python_toolbox import binary_search
-from python_toolbox import dict_tools
-from python_toolbox import nifty_collections
-from python_toolbox import caching
 
 from python_toolbox import math_tools
 from python_toolbox import sequence_tools
-from python_toolbox import cute_iter_tools
-from python_toolbox import nifty_collections
-
-from . import misc
-from python_toolbox import misc_tools
-
-infinity = float('inf')
-
 
         
 class ProductSpace(sequence_tools.CuteSequenceMixin, collections.Sequence):
@@ -67,9 +49,7 @@ def index(self, given_sequence):
                                 not len(given_sequence) == len(self.sequences):
             raise ValueError
         
-        reverse_indices = []
         current_radix = 1
-        
         wip_index = 0
             
         for item, sequence in reversed(tuple(zip(given_sequence,
diff --git a/source_py3/python_toolbox/combi/selection_space.py b/source_py3/python_toolbox/combi/selection_space.py
@@ -1,25 +1,6 @@
 import collections
-import types
-import sys
-import math
-import numbers
 
-from python_toolbox import misc_tools
-from python_toolbox import binary_search
-from python_toolbox import dict_tools
-from python_toolbox import nifty_collections
-from python_toolbox import caching
-
-from python_toolbox import math_tools
 from python_toolbox import sequence_tools
-from python_toolbox import cute_iter_tools
-from python_toolbox import nifty_collections
-
-from . import misc
-from python_toolbox import misc_tools
-
-infinity = float('inf')
-
 
         
 class SelectionSpace(sequence_tools.CuteSequenceMixin,
diff --git a/source_py3/python_toolbox/monkeypatching_tools.py b/source_py3/python_toolbox/monkeypatching_tools.py
@@ -3,7 +3,6 @@
 
 '''Tools for monkeypatching.'''
 
-import sys
 import collections
 import inspect
 import types
@@ -68,7 +67,7 @@ def decorator(function):
                 #                                                             #
                 if isinstance(function, caching.CachedProperty):
                     if not isinstance(function.getter, types.FunctionType):
-                        raise NotImplemented
+                        raise NotImplementedError
                     name_ = function.getter.__name__
                 elif isinstance(function, (classmethod, staticmethod)):
                     name_ = function.__func__.__name__
diff --git a/source_py3/python_toolbox/os_tools.py b/source_py3/python_toolbox/os_tools.py
@@ -6,7 +6,6 @@
 import subprocess
 import sys
 import os.path
-import pathlib
 
 
 def start_file(path):
@@ -28,7 +27,4 @@ def start_file(path):
             "Your operating system `%s` isn't supported by "
             "`start_file`." % sys.platform)
     
-    
-_is_windows = (os.name == 'nt')
-null_path = pathlib.Path(os.path.devnull)
-path_type = pathlib.WindowsPath if _is_windows else pathlib.PosixPath
+    
diff --git a/source_py3/python_toolbox/path_tools.py b/source_py3/python_toolbox/path_tools.py
@@ -4,16 +4,20 @@
 '''Defines various tools related to file-system paths.'''
 
 import sys
+import os
 import pathlib
 import glob
 import types
 
+_is_windows = (os.name == 'nt')
+null_path = pathlib.Path(os.path.devnull)
+path_type = pathlib.WindowsPath if _is_windows else pathlib.PosixPath
 
 def list_sub_folders(path):
     '''List all the immediate sub-folders of the folder at `path`.'''
     path = pathlib.Path(path)
     assert path.is_dir()
-    return list(filter(pathlib.Path.is_dir, path.glob('*')))
+    return tuple(filter(pathlib.Path.is_dir, path.glob('*')))
 
 
 def get_path_of_package(package):
@@ -48,3 +52,4 @@ def get_root_path_of_module(module):
                               map(pathlib.Path, sys.path)))
     return result
 
+
diff --git a/source_py3/python_toolbox/version_info.py b/source_py3/python_toolbox/version_info.py
@@ -38,15 +38,6 @@ def __new__(cls, major, minor=0, micro=0, modifier='release'):
         return tuple.__new__(cls, (major, minor, micro, modifier)) 
 
     
-    @classmethod
-    def _make(cls, iterable, new=tuple.__new__, len=len):
-        '''Make a new `VersionInfo` object from a sequence or iterable.'''
-        result = new(cls, iterable)
-        if len(result) != 4:
-            raise TypeError('Expected 4 arguments, got %d' % len(result))
-        return result 
-
-    
     def __repr__(self):
         '''Return a nicely formatted representation string.'''
         return 'VersionInfo(major=%r, minor=%r, micro=%r, modifier=%r)' % self
@@ -60,18 +51,6 @@ def _asdict(self):
         return OrderedDict(zip(self._fields, self))
 
     
-    def _replace(self, **kwargs):
-        '''
-        Make a `VersionInfo` object replacing specified fields with new values.
-        '''
-        result = \
-            self._make(map(kwargs.pop, ('major', 'minor', 'micro', 'modifier'),
-                           self))
-        if kwargs:
-            raise ValueError('Got unexpected field names: %r' % kwargs.keys())
-        return result 
-    
-    
     def __getnewargs__(self):
         '''Return self as a plain tuple. Used by copy and pickle.'''
         return tuple(self)
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 io
 import re
