Rename package observers to observation

MANIFEST.in

@@ -12,4 +12,4 @@ graft examples
 recursive-exclude examples *.pyc
 include traits/ctraits.c
 recursive-include traits *.py
-include traits/observers/_dsl_grammar.lark
+include traits/observation/_dsl_grammar.lark

docs/source/traits_api_reference/index.rst

@@ -40,7 +40,7 @@ Subpackages
 
     traits.adaptation
     traits.etsconfig
-    traits.observers
+    traits.observation
     traits.testing
     traits.util
 

docs/source/traits_api_reference/traits.observers.rst → docs/source/traits_api_reference/traits.observation.rst

@@ -1,26 +1,26 @@
-:mod:`traits.observers` Package
-===============================
+:mod:`traits.observation` Package
+=================================
 
-.. automodule:: traits.observers
+.. automodule:: traits.observation
     :members:
     :undoc-members:
     :show-inheritance:
 
 
-:mod:`traits.observers.expression` Module
------------------------------------------
+:mod:`traits.observation.expression` Module
+-------------------------------------------
 
-.. automodule:: traits.observers.expression
+.. automodule:: traits.observation.expression
     :members:
     :undoc-members:
     :show-inheritance:
     :special-members: __eq__, __or__
 
 
-:mod:`traits.observers.events` Module
--------------------------------------
+:mod:`traits.observation.events` Module
+---------------------------------------
 
-.. automodule:: traits.observers.events
+.. automodule:: traits.observation.events
     :members:
     :undoc-members:
     :show-inheritance:
@@ -42,10 +42,10 @@
    :inherited-members:
 
 
-:mod:`traits.observers.parsing` Module
---------------------------------------
+:mod:`traits.observation.parsing` Module
+----------------------------------------
 
-.. automodule:: traits.observers.parsing
+.. automodule:: traits.observation.parsing
     :members:
     :undoc-members:
     :show-inheritance:

etstool.py

@@ -398,7 +398,7 @@ def generate_parser(edm, runtime, environment):
     parameters = get_parameters(edm, runtime, environment)
 
     root_dir = os.path.dirname(__file__)
-    observers_dir = os.path.join(root_dir, "traits", "observers")
+    observers_dir = os.path.join(root_dir, "traits", "observation")
 
     # parser file to be generated.
     out_path = os.path.join(observers_dir, "_generated_parser.py")

setup.cfg

@@ -1,3 +1,3 @@
 [flake8]
-exclude = examples, traits/observers/_generated_parser.py
+exclude = examples, traits/observation/_generated_parser.py
 ignore = E266,W503,E722,E731,E741

traits/ctrait.py

@@ -20,7 +20,7 @@
 
 from . import ctraits
 from .constants import ComparisonMode, DefaultValue, default_value_map
-from .observers._i_observable import IObservable
+from .observation._i_observable import IObservable
 from .trait_base import SequenceTypes, Undefined
 from .trait_dict_object import TraitDictObject
 from .trait_list_object import TraitListObject

traits/has_traits.py

@@ -27,7 +27,7 @@
 from .constants import DefaultValue, TraitKind
 from .ctrait import CTrait, __newobj__
 from .ctraits import CHasTraits
-from .observers import api as observe_api
+from .observation import api as observe_api
 from .traits import (
     ForwardProperty,
     Property,
@@ -724,7 +724,7 @@ def updated(self, event):
             ...
 
     The decorated function must accept one argument which is the event object
-    representing the change. See :py:mod:`traits.observers.events` for details.
+    representing the change. See :mod:`traits.observation.events` for details.
 
     Parameters
     ----------
@@ -2209,7 +2209,7 @@ def observe(self, handler, expression, *, remove=False, dispatch="same"):
             A callable that will be invoked when the observed trait changes.
             It must accept one argument, which is an event object providing
             information about the change.
-            See :py:mod:`traits.observers.events` for details.
+            See :py:mod:`traits.observation.events` for details.
         expression : str or list or ObserverExpression
             A description of what traits are being observed.
             If this is a list, each item must be a string or an Expression.

traits/observers/_dict_item_observer.py → traits/observation/_dict_item_observer.py

@@ -8,11 +8,11 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.observers._dict_change_event import dict_event_factory
-from traits.observers._i_observer import IObserver
-from traits.observers._observe import add_or_remove_notifiers
-from traits.observers._observer_change_notifier import ObserverChangeNotifier
-from traits.observers._trait_event_notifier import TraitEventNotifier
+from traits.observation._dict_change_event import dict_event_factory
+from traits.observation._i_observer import IObserver
+from traits.observation._observe import add_or_remove_notifiers
+from traits.observation._observer_change_notifier import ObserverChangeNotifier
+from traits.observation._trait_event_notifier import TraitEventNotifier
 from traits.trait_dict_object import TraitDict
 
 

traits/observers/_filtered_trait_observer.py → traits/observation/_filtered_trait_observer.py

@@ -8,16 +8,16 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.observers._has_traits_helpers import (
+from traits.observation._has_traits_helpers import (
     iter_objects,
     observer_change_handler,
 )
-from traits.observers._i_observer import IObserver
-from traits.observers._observer_change_notifier import ObserverChangeNotifier
-from traits.observers._observer_graph import ObserverGraph
-from traits.observers._trait_change_event import trait_event_factory
-from traits.observers._trait_added_observer import TraitAddedObserver
-from traits.observers._trait_event_notifier import TraitEventNotifier
+from traits.observation._i_observer import IObserver
+from traits.observation._observer_change_notifier import ObserverChangeNotifier
+from traits.observation._observer_graph import ObserverGraph
+from traits.observation._trait_change_event import trait_event_factory
+from traits.observation._trait_added_observer import TraitAddedObserver
+from traits.observation._trait_event_notifier import TraitEventNotifier
 from traits.trait_base import Uninitialized
 
 

traits/observers/_has_traits_helpers.py → traits/observation/_has_traits_helpers.py

@@ -15,8 +15,8 @@
 
 from traits.constants import ComparisonMode
 from traits.ctraits import CHasTraits
-from traits.observers._exceptions import NotifierNotFound
-from traits.observers._observe import add_or_remove_notifiers
+from traits.observation._exceptions import NotifierNotFound
+from traits.observation._observe import add_or_remove_notifiers
 from traits.trait_base import Undefined, Uninitialized
 from traits.trait_types import Dict, List, Set
 

traits/observers/_list_item_observer.py → traits/observation/_list_item_observer.py

@@ -8,11 +8,11 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.observers._list_change_event import list_event_factory
-from traits.observers._i_observer import IObserver
-from traits.observers._trait_event_notifier import TraitEventNotifier
-from traits.observers._observe import add_or_remove_notifiers
-from traits.observers._observer_change_notifier import ObserverChangeNotifier
+from traits.observation._list_change_event import list_event_factory
+from traits.observation._i_observer import IObserver
+from traits.observation._trait_event_notifier import TraitEventNotifier
+from traits.observation._observe import add_or_remove_notifiers
+from traits.observation._observer_change_notifier import ObserverChangeNotifier
 from traits.trait_list_object import TraitList
 
 

traits/observers/_named_trait_observer.py → traits/observation/_named_trait_observer.py

@@ -8,17 +8,17 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.observers._trait_change_event import trait_event_factory
-from traits.observers._has_traits_helpers import (
+from traits.observation._trait_change_event import trait_event_factory
+from traits.observation._has_traits_helpers import (
     iter_objects,
     object_has_named_trait,
     observer_change_handler,
 )
-from traits.observers._i_observer import IObserver
-from traits.observers._observer_change_notifier import ObserverChangeNotifier
-from traits.observers._observer_graph import ObserverGraph
-from traits.observers._trait_added_observer import TraitAddedObserver
-from traits.observers._trait_event_notifier import TraitEventNotifier
+from traits.observation._i_observer import IObserver
+from traits.observation._observer_change_notifier import ObserverChangeNotifier
+from traits.observation._observer_graph import ObserverGraph
+from traits.observation._trait_added_observer import TraitAddedObserver
+from traits.observation._trait_event_notifier import TraitEventNotifier
 from traits.trait_base import Uninitialized
 
 

traits/observers/_observer_change_notifier.py → traits/observation/_observer_change_notifier.py

@@ -11,7 +11,7 @@
 import types
 import weakref
 
-from traits.observers._exceptions import NotifierNotFound
+from traits.observation._exceptions import NotifierNotFound
 
 
 class ObserverChangeNotifier:

traits/observers/_set_item_observer.py → traits/observation/_set_item_observer.py

@@ -8,11 +8,11 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.observers._i_observer import IObserver
-from traits.observers._observe import add_or_remove_notifiers
-from traits.observers._observer_change_notifier import ObserverChangeNotifier
-from traits.observers._set_change_event import set_event_factory
-from traits.observers._trait_event_notifier import TraitEventNotifier
+from traits.observation._i_observer import IObserver
+from traits.observation._observe import add_or_remove_notifiers
+from traits.observation._observer_change_notifier import ObserverChangeNotifier
+from traits.observation._set_change_event import set_event_factory
+from traits.observation._trait_event_notifier import TraitEventNotifier
 from traits.trait_set_object import TraitSet
 
 

traits/observers/_testing.py → traits/observation/_testing.py

@@ -10,9 +10,9 @@
 
 from unittest import mock
 
-from traits.observers._exceptions import NotifierNotFound
-from traits.observers._observe import add_or_remove_notifiers
-from traits.observers._observer_graph import ObserverGraph
+from traits.observation._exceptions import NotifierNotFound
+from traits.observation._observe import add_or_remove_notifiers
+from traits.observation._observer_graph import ObserverGraph
 
 
 #: An object that does not get garbage collected until the very end

traits/observers/_trait_added_observer.py → traits/observation/_trait_added_observer.py

@@ -8,15 +8,15 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.observers._has_traits_helpers import (
+from traits.observation._has_traits_helpers import (
     iter_objects,
     object_has_named_trait,
 )
-from traits.observers._i_observer import IObserver
-from traits.observers._observe import add_or_remove_notifiers
-from traits.observers._observer_change_notifier import ObserverChangeNotifier
-from traits.observers._observer_graph import ObserverGraph
-from traits.observers._trait_change_event import trait_event_factory
+from traits.observation._i_observer import IObserver
+from traits.observation._observe import add_or_remove_notifiers
+from traits.observation._observer_change_notifier import ObserverChangeNotifier
+from traits.observation._observer_graph import ObserverGraph
+from traits.observation._trait_change_event import trait_event_factory
 
 
 @IObserver.register

traits/observers/_trait_event_notifier.py → traits/observation/_trait_event_notifier.py

@@ -12,8 +12,8 @@
 import types
 import weakref
 
-from traits.observers._exception_handling import handle_exception
-from traits.observers._exceptions import NotifierNotFound
+from traits.observation._exception_handling import handle_exception
+from traits.observation._exceptions import NotifierNotFound
 
 
 class TraitEventNotifier:

traits/observers/api.py → traits/observation/api.py

@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.observers.expression import (   # noqa: F401
+from traits.observation.expression import (   # noqa: F401
     dict_items,
     list_items,
     match,
@@ -17,8 +17,8 @@
     trait,
 )
 
-from traits.observers.observe import (   # noqa: F401
+from traits.observation.observe import (   # noqa: F401
     dispatch_same,
     observe,
 )
-from traits.observers.parsing import parse     # noqa: F401
+from traits.observation.parsing import parse     # noqa: F401

traits/observers/events.py → traits/observation/events.py

@@ -11,18 +11,18 @@
 """ Event objects received by change handlers added using observe.
 """
 
-from traits.observers._dict_change_event import (   # noqa: F401
+from traits.observation._dict_change_event import (   # noqa: F401
     DictChangeEvent,
 )
 
-from traits.observers._list_change_event import (   # noqa: F401
+from traits.observation._list_change_event import (   # noqa: F401
     ListChangeEvent,
 )
 
-from traits.observers._set_change_event import (    # noqa: F401
+from traits.observation._set_change_event import (    # noqa: F401
     SetChangeEvent,
 )
 
-from traits.observers._trait_change_event import (   # noqa: F401
+from traits.observation._trait_change_event import (   # noqa: F401
     TraitChangeEvent,
 )