Renamed context_managers to context_management

cool-RR · cool-RR · commit 6e3ac5ee63b1 · 2012-12-25T02:36:59.000+02:00
diff --git a/README.markdown b/README.markdown
@@ -9,7 +9,7 @@ contains:
  - `python_toolbox.cute_iter_tools`: Tools for manipulating iterables. Adds
    useful functions not found in Python's built-in `itertools`.
  
- - `python_toolbox.context_managers`: Pimping up your context managers.
+ - `python_toolbox.context_management`: Pimping up your context managers.
  
  - `python_toolbox.emitters`: A publisher-subscriber framework that doesn't
    abuse strings.
diff --git a/docs/topics/context-management.txt b/docs/topics/context-management.txt
@@ -6,8 +6,8 @@
 
 .. _topics-context-managers:
 
-:mod:`context_managers`
-=======================
+:mod:`context_management`
+=========================
 
 Context managers are awesome
 ----------------------------
@@ -34,7 +34,7 @@ The :class:`ContextManager` class allows using context managers as decorators
 new form called :meth:`manage_context`. (As well as the original forms).
 First let's import:
 
-   >>> from python_toolbox import context_managers
+   >>> from python_toolbox import context_management
    
 Now let's go over the features one by one.
 
@@ -52,15 +52,15 @@ has their own advantages and disadvantages over the others.
   :meth:`__enter__` and :meth:`__exit__` methods. This is allowed, and if you
   do this you should still inherit from :class:`ContextManager`. Example:
   
-     >>> class MyContextManager(context_managers.ContextManager):
+     >>> class MyContextManager(context_management.ContextManager):
      ...     def __enter__(self):
      ...         pass # preparation
      ...     def __exit__(self, type_=None, value=None, traceback=None):
      ...         pass # cleanup
              
 - As a decorated generator, like so:
 
-     >>> @context_managers.ContextManagerType
+     >>> @context_management.ContextManagerType
      ... def MyContextManager():
      ...     # preparation
      ...     try:
@@ -74,7 +74,7 @@ has their own advantages and disadvantages over the others.
   This usage is nothing new; it's also available when using the standard
   library's :func:`contextlib.contextmanager` decorator. One thing that is
   allowed here that :mod:`contextlib` doesn't allow is to yield the context
-  manager itself by doing ``yield context_managers.SelfHook``.
+  manager itself by doing ``yield context_management.SelfHook``.
 
 - The third and novel way is by defining a class with a :meth:`manage_context`
   method which returns a decorator. Example:
diff --git a/python_toolbox/context_management/__init__.py b/python_toolbox/context_management/__init__.py
diff --git a/python_toolbox/context_management/base_classes/__init__.py b/python_toolbox/context_management/base_classes/__init__.py
diff --git a/python_toolbox/context_management/base_classes/decorating_context_manager.py b/python_toolbox/context_management/base_classes/decorating_context_manager.py
diff --git a/python_toolbox/context_management/blank_context_manager.py b/python_toolbox/context_management/blank_context_manager.py
diff --git a/python_toolbox/context_management/context_manager.py b/python_toolbox/context_management/context_manager.py
diff --git a/python_toolbox/context_management/context_manager_type.py b/python_toolbox/context_management/context_manager_type.py
@@ -146,7 +146,7 @@ def __is_the_base_context_manager_class(cls):
         
         return (
             (cls.__name__ == 'ContextManager') and
-            (cls.__module__ == 'python_toolbox.context_managers.'
+            (cls.__module__ == 'python_toolbox.context_management.'
                                'context_manager') and
             (cls.mro() == [cls, object])
         )
diff --git a/python_toolbox/context_management/context_manager_type_type.py b/python_toolbox/context_management/context_manager_type_type.py
diff --git a/python_toolbox/context_management/delegating_context_manager.py b/python_toolbox/context_management/delegating_context_manager.py
diff --git a/python_toolbox/context_management/functions.py b/python_toolbox/context_management/functions.py
diff --git a/python_toolbox/context_management/reentrant_context_manager.py b/python_toolbox/context_management/reentrant_context_manager.py
diff --git a/python_toolbox/context_management/self_hook.py b/python_toolbox/context_management/self_hook.py
diff --git a/python_toolbox/cute_testing.py b/python_toolbox/cute_testing.py
@@ -6,7 +6,7 @@
 from python_toolbox.third_party import unittest2
 
 from python_toolbox import cute_inspect
-from python_toolbox.context_managers import ContextManager
+from python_toolbox.context_management import ContextManager
 from python_toolbox.exceptions import CuteException
 from python_toolbox import logic_tools
 
diff --git a/python_toolbox/emitters/emitter_system/emitter_system.py b/python_toolbox/emitters/emitter_system/emitter_system.py
@@ -13,7 +13,7 @@
 
 from python_toolbox import freezers
 from python_toolbox import cute_iter_tools
-from python_toolbox.context_managers import ReentrantContextManager
+from python_toolbox.context_management import ReentrantContextManager
 
 from .emitter import Emitter
 
diff --git a/python_toolbox/freezers/delegatee_context_manager.py b/python_toolbox/freezers/delegatee_context_manager.py
@@ -7,10 +7,10 @@
 See its documentation for more information.
 '''
 
-from python_toolbox import context_managers
+from python_toolbox import context_management
 
 
-class DelegateeContextManager(context_managers.ReentrantContextManager):
+class DelegateeContextManager(context_management.ReentrantContextManager):
     '''Inner context manager used internally by `Freezer`.'''
     
     def __init__(self, freezer):
diff --git a/python_toolbox/freezers/freezer.py b/python_toolbox/freezers/freezer.py
@@ -9,14 +9,14 @@
 
 from python_toolbox.third_party import abc
 
-from python_toolbox import context_managers
+from python_toolbox import context_management
 from python_toolbox import proxy_property
 from python_toolbox import caching
 
 from .delegatee_context_manager import DelegateeContextManager
 
 
-class Freezer(context_managers.DelegatingContextManager):
+class Freezer(context_management.DelegatingContextManager):
     '''
     A freezer is used as a context manager to "freeze" and "thaw" an object.
     
diff --git a/python_toolbox/read_write_lock/read_write_lock.py b/python_toolbox/read_write_lock/read_write_lock.py
@@ -6,15 +6,15 @@
 '''
 # todo: organize.
 
-from python_toolbox import context_managers
+from python_toolbox import context_management
 
 from . import original_read_write_lock
 
 
 __all__ = ['ReadWriteLock']
 
 
-class ContextManager(context_managers.ContextManager):
+class ContextManager(context_management.ContextManager):
 
     def __init__(self, lock, acquire_func):
         self.lock = lock
diff --git a/python_toolbox/sys_tools.py b/python_toolbox/sys_tools.py
@@ -9,7 +9,7 @@
 import sys
 import cStringIO
 
-from python_toolbox.context_managers import (ContextManager,
+from python_toolbox.context_management import (ContextManager,
                                                     BlankContextManager)
 from python_toolbox.temp_value_setters import TempValueSetter
 from python_toolbox.reasoned_bool import ReasonedBool
diff --git a/python_toolbox/temp_file_tools.py b/python_toolbox/temp_file_tools.py
@@ -9,7 +9,7 @@
 import shutil
 import os
 
-from python_toolbox.context_managers import ContextManager
+from python_toolbox.context_management import ContextManager
 
 
 
diff --git a/python_toolbox/temp_value_setters/temp_value_setter.py b/python_toolbox/temp_value_setters/temp_value_setter.py
@@ -8,7 +8,7 @@
 '''
 
 from python_toolbox import address_tools
-from python_toolbox.context_managers import ContextManager
+from python_toolbox.context_management import ContextManager
 
 
 __all__ = ['TempValueSetter']
diff --git a/python_toolbox/wx_tools/widgets/cute_dialog_type.py b/python_toolbox/wx_tools/widgets/cute_dialog_type.py
@@ -12,7 +12,7 @@
 import wx
 
 from python_toolbox.wx_tools.cursors import CursorChanger
-from python_toolbox import context_managers
+from python_toolbox import context_management
 
 from python_toolbox.wx_tools.widgets.cute_window import CuteWindow
 
@@ -21,6 +21,6 @@ class CuteDialogType(type(CuteWindow)):
     def __call__(self, parent, *args, **kwargs):
         context_manager = \
             CursorChanger(parent, wx.CURSOR_WAIT) if parent else \
-            context_managers.BlankContextManager()
+            context_management.BlankContextManager()
         with context_manager:
             return type.__call__(self, parent, *args, **kwargs)
diff --git a/python_toolbox/wx_tools/widgets/cute_window/cute_window.py b/python_toolbox/wx_tools/widgets/cute_window/cute_window.py
@@ -12,7 +12,7 @@
 from python_toolbox import wx_tools
 from python_toolbox import caching
 from python_toolbox import freezers
-from python_toolbox.context_managers import ContextManager
+from python_toolbox.context_management import ContextManager
 
 from .accelerator_savvy_window import AcceleratorSavvyWindow
 from .bind_savvy_evt_handler import BindSavvyEvtHandler
diff --git a/python_toolbox/wx_tools/widgets/hue_selection_dialog/textual.py b/python_toolbox/wx_tools/widgets/hue_selection_dialog/textual.py
@@ -15,7 +15,7 @@
 from python_toolbox import freezers
 from python_toolbox import wx_tools
 from python_toolbox.wx_tools.widgets.cute_panel import CutePanel
-from python_toolbox.context_managers import ReentrantContextManager
+from python_toolbox.context_management import ReentrantContextManager
 
 
 def ratio_to_round_degrees(ratio):
diff --git a/setup.py b/setup.py
@@ -76,7 +76,7 @@ def get_packages():
  - ``python_toolbox.cute_iter_tools``: Tools for manipulating iterables. Adds
     useful functions not found in Python's built-in ``itertools``.
  
- - ``python_toolbox.context_managers``: Pimping up your context managers.
+ - ``python_toolbox.context_management``: Pimping up your context managers.
  
  - ``python_toolbox.emitters``: A publisher-subscriber framework that doesn't
     abuse strings.
diff --git a/test_python_toolbox/test_caching/test_cached_property.py b/test_python_toolbox/test_caching/test_cached_property.py
@@ -5,7 +5,7 @@
 
 import nose
 
-from python_toolbox import context_managers
+from python_toolbox import context_management
 
 from python_toolbox.caching import cache, CachedType, CachedProperty
 
@@ -163,7 +163,7 @@ def test_decorating():
     
     class A(object):
         reentrant_context_manager = CachedProperty(
-            lambda self: context_managers.ReentrantContextManager()
+            lambda self: context_management.ReentrantContextManager()
         )
         
         @reentrant_context_manager
diff --git a/test_python_toolbox/test_context_management/__init__.py b/test_python_toolbox/test_context_management/__init__.py
diff --git a/test_python_toolbox/test_context_management/test_abstractness.py b/test_python_toolbox/test_context_management/test_abstractness.py
@@ -9,7 +9,7 @@
 
 import nose
 
-from python_toolbox.context_managers import (ContextManager,
+from python_toolbox.context_management import (ContextManager,
                                                     ContextManagerType,
                                                     SelfHook)
 
diff --git a/test_python_toolbox/test_context_management/test_context_manager.py b/test_python_toolbox/test_context_management/test_context_manager.py
@@ -1,13 +1,13 @@
 # Copyright 2009-2012 Ram Rachum.
 # This program is distributed under the MIT license.
 
-'''Test the `python_toolbox.context_managers` module.'''
+'''Test the `python_toolbox.context_management` module.'''
 
 from __future__ import with_statement 
 
 from python_toolbox import cute_testing
 
-from python_toolbox.context_managers import (ContextManager,
+from python_toolbox.context_management import (ContextManager,
                                              ContextManagerType,
                                              SelfHook)
 
diff --git a/test_python_toolbox/test_context_management/test_external.py b/test_python_toolbox/test_context_management/test_external.py
@@ -11,7 +11,7 @@
 from python_toolbox.third_party import unittest2
 
 import python_toolbox
-from python_toolbox.context_managers import (ContextManager,
+from python_toolbox.context_management import (ContextManager,
                                                     ContextManagerType)
 
 
diff --git a/test_python_toolbox/test_context_management/test_nested.py b/test_python_toolbox/test_context_management/test_nested.py
@@ -1,13 +1,13 @@
 # Copyright 2009-2012 Ram Rachum.
 # This program is distributed under the MIT license.
 
-'''Test the `python_toolbox.context_managers.nested` function.'''
+'''Test the `python_toolbox.context_management.nested` function.'''
 
 from __future__ import with_statement 
 
 from python_toolbox import cute_testing
 
-from python_toolbox.context_managers import ReentrantContextManager, nested
+from python_toolbox.context_management import ReentrantContextManager, nested
 
 
 
diff --git a/test_python_toolbox/test_context_management/test_problematic_context_managers.py b/test_python_toolbox/test_context_management/test_problematic_context_managers.py
@@ -9,7 +9,7 @@
 
 from python_toolbox import cute_testing
 
-from python_toolbox.context_managers import (ContextManager,
+from python_toolbox.context_management import (ContextManager,
                                                     ContextManagerType,
                                                     SelfHook)
 
diff --git a/test_python_toolbox/test_context_management/test_reentrant_context_manager.py b/test_python_toolbox/test_context_management/test_reentrant_context_manager.py
@@ -1,13 +1,13 @@
 # Copyright 2009-2012 Ram Rachum.
 # This program is distributed under the MIT license.
 
-'''Testing module for `context_managers.ReentrantContextManager`.''' 
+'''Testing module for `context_management.ReentrantContextManager`.''' 
 
 from __future__ import with_statement
 
 import Queue as queue_module
 
-from python_toolbox.context_managers import ReentrantContextManager
+from python_toolbox.context_management import ReentrantContextManager
 from python_toolbox import cute_testing
 
 
diff --git a/test_python_toolbox/test_cute_iter_tools/test_iter_with.py b/test_python_toolbox/test_cute_iter_tools/test_iter_with.py
@@ -5,12 +5,12 @@
 
 import itertools
 
-from python_toolbox import context_managers
+from python_toolbox import context_management
 
 from python_toolbox.cute_iter_tools import iter_with
 
 
-class MyContextManager(context_managers.ContextManager):
+class MyContextManager(context_management.ContextManager):
     def __init__(self):
         self.counter = -1
         self.active = False

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ def __is_the_base_context_manager_class(cls):`
`146`	`146`
`147`	`147`	`return (`
`148`	`148`	`(cls.__name__ == 'ContextManager') and`
`149`		`- (cls.__module__ == 'python_toolbox.context_managers.'`
	`149`	`+ (cls.__module__ == 'python_toolbox.context_management.'`
`150`	`150`	`'context_manager') and`
`151`	`151`	`(cls.mro() == [cls, object])`
`152`	`152`	`)`