-

cool-RR · cool-RR · commit 69123c0ccae7 · 2014-07-15T18:18:14.000+03:00
diff --git a/source_py3/python_toolbox/cute_iter_tools.py b/source_py3/python_toolbox/cute_iter_tools.py
@@ -10,14 +10,11 @@
 import builtins
 import numbers
 
-from python_toolbox import sys_tools
-from python_toolbox import misc_tools
 from python_toolbox import math_tools
-from python_toolbox import logic_tools
-
 
 infinity = float('inf')
 
+
 class _EMPTY_SENTINEL:
     pass
 
@@ -395,6 +392,8 @@ def get_single_if_any(iterable,
         
         
 def are_equal(*sequences):
+    from python_toolbox import sys_tools
+    from python_toolbox import logic_tools
     sequence_types = set(map(type, sequences))
     
     if not sys_tools.is_pypy: # Hack around Pypy bug 1799
@@ -420,6 +419,7 @@ def are_equal(*sequences):
 
     
 def is_sorted(iterable, key=None):
+    from python_toolbox import misc_tools
     if key is None:
         key = misc_tools.identity_function
     for first_item, second_item in \
diff --git a/source_py3/python_toolbox/math_tools/types.py b/source_py3/python_toolbox/math_tools/types.py
@@ -2,6 +2,7 @@
 # This program is distributed under the MIT license.
 
 import abc
+import numbers
 
 
 class _PossiblyInfiniteIntegralType(abc.ABCMeta):
diff --git a/source_py3/python_toolbox/misc_tools/__init__.py b/source_py3/python_toolbox/misc_tools/__init__.py
@@ -3,14 +3,6 @@
 
 '''This module defines miscellaneous tools.'''
 
-from .misc_tools import (
-    is_subclass, get_mro_depth_of_method, frange, getted_vars,
-    _ascii_variable_pattern, is_legal_ascii_variable_name,
-    is_magic_variable_name, get_actual_type, is_number, identity_function,
-    do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle,
-    general_sum, general_product, is_legal_email_address, is_type, NonInstatiable,
-    repeat_getattr, add_extension_if_plain, set_attributes, pocket,
-    decimal_number_from_string
-)
+from .misc_tools import *
 from . import name_mangling
 from .proxy_property import ProxyProperty
diff --git a/source_py3/python_toolbox/nifty_collections/lazy_tuple.py b/source_py3/python_toolbox/nifty_collections/lazy_tuple.py
@@ -13,7 +13,6 @@
 
 from python_toolbox import decorator_tools
 from python_toolbox import comparison_tools
-from python_toolbox import sequence_tools
 
 
 infinity = float('inf')
@@ -141,6 +140,8 @@ def exhaust(self, i=infinity):
         This will take enough items so we will have `i` items in total,
         including the items we had before.
         '''
+        from python_toolbox import sequence_tools
+        
         if self.exhausted:
             return
         
@@ -153,14 +154,14 @@ def exhaust(self, i=infinity):
             # todo: can be smart and figure out if it's an empty slice and then
             # not exhaust.
             
-            (start, stop, step) = sequence_tools.parse_slice(i)
+            canonical_slice = sequence_tools.CanonicalSlice(i)
             
             exhaustion_point = max(
-                _convert_index_to_exhaustion_point(start),
-                _convert_index_to_exhaustion_point(stop)
+                _convert_index_to_exhaustion_point(canonical_slice.start),
+                _convert_index_to_exhaustion_point(canonical_slice.stop)
             )
             
-            if step > 0: # Compensating for excluded last item:
+            if canonical_slice.step > 0: # Compensating for excluded last item:
                 exhaustion_point -= 1
             
         while len(self.collected_data) <= exhaustion_point:
diff --git a/source_py3/python_toolbox/sequence_tools.py b/source_py3/python_toolbox/sequence_tools.py
@@ -159,58 +159,6 @@ def is_immutable_sequence(thing):
                                  isinstance(thing, collections.MutableSequence)
 
 
-def parse_slice(s):
-    '''
-    Parse a `slice` object into a canonical `(start, stop, step)`.
-
-    This is helpful because `slice`'s own `.start`, `.stop` and `.step` are
-    sometimes specified as `None` for convenience, so Python will infer them
-    automatically. Here we make them explicit.
-
-    if `start` is `None`, it will be set to `0` (if the `step` is positive) or
-    `infinity` (if the `step` is negative.)
-
-    if `stop` is `None`, it will be set to `infinity` (if the `step` is
-    positive) or `0` (if the `step` is negative.)
-
-    If `step` is `None`, it will be changed to the default `1`.
-    '''
-    assert isinstance(s, slice)
-
-    ### Parsing `step`:
-    assert s.step != 0
-    if s.step is None:
-        step = 1
-    else:
-        step = s.step
-    ###
-
-    ### Parsing `start`:
-    if s.start is not None:
-        start = s.start
-    else:
-        assert s.start is None
-        if step > 0:
-            start = 0
-        else:
-            assert step < 0
-            start = infinity
-    ###
-
-    ### Parsing `stop`:
-    if s.stop is not None:
-        stop = s.stop
-    else:
-        assert s.stop is None
-        if step > 0:
-            stop = infinity
-        else:
-            assert step < 0
-            stop = -infinity
-    ###
-
-    return (start, stop, step)
-
 
 def to_tuple(single_or_sequence, item_type=None, item_test=None):
     '''
@@ -360,7 +308,6 @@ def ensure_iterable_is_sequence(iterable, default_type=tuple,
         return default_type(iterable)
 
 
-
 class CanonicalSlice: # blockodo replace parse_slice everywhere
     def __init__(self, slice_, iterable_or_length=None, offset=0):
         '''
@@ -481,7 +428,7 @@ def __init__(self, slice_, iterable_or_length=None, offset=0):
     
     
     
-class CuteSequenceMixin(shy_misc_tools.AlternativeLengthMixin):
+class CuteSequenceMixin(misc_tools.AlternativeLengthMixin):
     def take_random(self):
         return self[random.randint(0, get_length(self))]
         
diff --git a/source_py3/test_python_toolbox/test_sequence_tools/test_parse_slice.py b/source_py3/test_python_toolbox/test_sequence_tools/test_parse_slice.py
@@ -1,8 +1,6 @@
 # Copyright 2009-2014 Ram Rachum.
 # This program is distributed under the MIT license.
 
-'''Testing module for `sequence_tools.parse_slice`.'''
-
 from python_toolbox import math_tools
 
 from python_toolbox.sequence_tools import parse_slice
@@ -12,7 +10,6 @@
 
 
 def test():
-    '''Test the basic workings of `parse_slice`.'''
     
     r1 = list(range(5))
     r2 = list(range(2, 10))
