-

cool-RR · cool-RR · commit bc970c37e122 · 2011-12-31T19:47:36.000-05:00
diff --git a/.coveragerc b/.coveragerc
@@ -6,6 +6,11 @@ source =
 [report]
 # Gotta ignore errors because I create temporary code files:
 ignore_errors = True
+
+omit =
+    *third_party*
+    *forked_inspect*
+    *python26_site*
     
 [html]
 directory = .coverage_html_report
diff --git a/python_toolbox/nifty_collections/__init__.py b/python_toolbox/nifty_collections/__init__.py
@@ -8,4 +8,7 @@
 from .weak_key_default_dict import WeakKeyDefaultDict
 from .weak_key_identity_dict import WeakKeyIdentityDict
 from .counter import Counter
-from .lazy_tuple import LazyTuple
+from .lazy_tuple import LazyTuple
+
+from .emitting_ordered_set import EmittingOrderedSet
+from .emitting_weak_key_default_dict import EmittingWeakKeyDefaultDict
diff --git a/python_toolbox/read_write_lock/read_write_lock.py b/python_toolbox/read_write_lock/read_write_lock.py
@@ -15,11 +15,15 @@
 
 
 class ContextManager(context_managers.ContextManager):
+
     def __init__(self, lock, acquire_func):
         self.lock = lock
         self.acquire_func = acquire_func
+
     def __enter__(self):
         self.acquire_func()
+        return self.lock
+
     def __exit__(self, exc_type, exc_value, exc_traceback):
         self.lock.release()
 
@@ -35,10 +39,10 @@ class ReadWriteLock(original_read_write_lock.ReadWriteLock):
     
     Usage:
     
-        lock = ReadWriteLock()
-        with lock.read:
+        read_write_lock = ReadWriteLock()
+        with read_write_lock.read:
             pass # perform read operations here
-        with lock.write:
+        with read_write_lock.write:
             pass # perform write operations here
             
     '''
diff --git a/python_toolbox/wx_tools/generic_bitmaps.py b/python_toolbox/wx_tools/generic_bitmaps.py
@@ -13,13 +13,13 @@
 is_win = (wx.Platform == '__WXMSW__')
 
 
-if is_win:
-    import win32api
-
-
 @caching.cache()
 def _get_icon_bitmap_from_shell32_dll(index_number, size):
     assert isinstance(index_number, int)
+    assert is_win
+
+    import win32api
+    
     width, height = size
     shell32_dll = win32api.GetModuleFileName(
         win32api.GetModuleHandle('shell32.dll')
diff --git a/test_python_toolbox/test_read_write_lock/__init__.py b/test_python_toolbox/test_read_write_lock/__init__.py
diff --git a/test_python_toolbox/test_read_write_lock/test.py b/test_python_toolbox/test_read_write_lock/test.py
@@ -0,0 +1,34 @@
+from python_toolbox.read_write_lock import ReadWriteLock
+
+
+def test():
+    ''' '''
+    read_write_lock = ReadWriteLock()
+    with read_write_lock.read:
+        pass
+    with read_write_lock.write:
+        pass
+    with read_write_lock.read as enter_return_value:
+        assert enter_return_value is read_write_lock
+        
+    with read_write_lock.read:
+        with read_write_lock.read:
+            with read_write_lock.read:
+                with read_write_lock.read:
+                    with read_write_lock.write:
+                        with read_write_lock.write:
+                            with read_write_lock.write:
+                                with read_write_lock.write:
+                                    pass
+                                
+    with read_write_lock.write:
+        with read_write_lock.write:
+            with read_write_lock.write:
+                with read_write_lock.write:
+                    with read_write_lock.read:
+                        with read_write_lock.read:
+                            with read_write_lock.read:
+                                with read_write_lock.read:
+                                    pass
+                                
+    
