-

cool-RR · cool-RR · commit 30ec7ca7b881 · 2014-02-22T15:17:47.000+02:00
diff --git a/misc/IDE files/Wing/python_toolbox_py3.wpr b/misc/IDE files/Wing/python_toolbox_py3.wpr
@@ -34,7 +34,7 @@ proj.directory-list = [{'dirloc': loc('../../..'),
                         'watch_for_changes': True}]
 proj.file-type = 'shared'
 proj.home-dir = loc('../../..')
-proj.launch-config = {loc('../../../../../../Dropbox/Desktop/run_in_bash.py'): (''\
+proj.launch-config = {loc('../../../source_py3/python_toolbox/cute_iter_tools.py'): (''\
         'project',
         (u'',
          'launch-OHU716PSo2P5T54y'))}
diff --git a/source_py3/python_toolbox/address_tools/object_to_string.py b/source_py3/python_toolbox/address_tools/object_to_string.py
@@ -6,7 +6,6 @@
 import types
 import re
 
-from python_toolbox import import_tools
 from python_toolbox import dict_tools
 from python_toolbox import caching
 
diff --git a/source_py3/python_toolbox/address_tools/string_to_object.py b/source_py3/python_toolbox/address_tools/string_to_object.py
@@ -5,11 +5,9 @@
 
 import types
 
-from python_toolbox import import_tools
 from python_toolbox import dict_tools
 from python_toolbox import re_tools
 
-# from . import object_to_string (at bottom of file.)
 from .shared import (_contained_address_pattern, _address_pattern,
                      _get_parent_and_dict_from_namespace)
 
@@ -90,6 +88,8 @@ def get_object_by_address(address, root=None, namespace={}):
     # todo: should know what exception this will raise if the address is bad /
     # object doesn't exist.
     
+    from python_toolbox import import_tools # Avoiding circular import.
+    
     if not _address_pattern.match(address):
         raise ValueError("'%s' is not a legal address." % address)
     
@@ -203,6 +203,4 @@ def get_object_by_address(address, root=None, namespace={}):
     
         #                                                                     #
         ### Finished solving recursively for a composite address. #############
-        
-
-from . import object_to_string
+        
diff --git a/source_py3/python_toolbox/cute_iter_tools.py b/source_py3/python_toolbox/cute_iter_tools.py
@@ -343,11 +343,13 @@ def call_until_exception(function, exception, lazy_tuple=False):
 
 def _call_until_exception(function, exception):
     from python_toolbox import sequence_tools
-    exceptions = sequence_tools.to_tuple(exception, item_type=BaseException)
+    exceptions = sequence_tools.to_tuple(exception, item_type=type)
     try:
-        yield function()
+        while True:
+            yield function()
     except exceptions:
         raise StopIteration
+
     
 def get_single_if_any(iterable,
                       exception_on_multiple=Exception('More than one value '
diff --git a/source_py3/python_toolbox/nifty_collections/emitting_ordered_set.py b/source_py3/python_toolbox/nifty_collections/emitting_ordered_set.py
@@ -10,14 +10,14 @@
 from .ordered_set import (
     OrderedSet, KEY, PREV, NEXT
 )
-from python_toolbox.emitting import Emitter
 
 
 class EmittingOrderedSet(OrderedSet):
     '''An ordered set that emits to `.emitter` every time it's modified.'''
     
     def __init__(self, emitter, items=()):
         if emitter:
+            from python_toolbox.emitting import Emitter
             assert isinstance(emitter, Emitter)
         self.emitter = emitter
         OrderedSet.__init__(self, items)
diff --git a/source_py3/test_python_toolbox/test_cute_iter_tools/test_call_until_exception.py b/source_py3/test_python_toolbox/test_cute_iter_tools/test_call_until_exception.py
@@ -0,0 +1,13 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+import collections
+
+from python_toolbox.cute_iter_tools import call_until_exception
+
+
+def test():
+    
+    assert list(call_until_exception(collections.deque(range(7)).popleft,
+                                     IndexError)) == list(range(7))
+    
