Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Callback to Handler #298

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Rename Callback to Handler #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18c77d2
Implement #293
mottosso Oct 9, 2016
5f9139c
- Move callback functionality to lib.py
mottosso Oct 9, 2016
d4c4913
Add tests, add Python 3-compatible WeakRef
mottosso Oct 10, 2016
e3b1524
Python 2.6 compatible tests
mottosso Oct 10, 2016
0de9719
Python 2.6 compatibility for tests
mottosso Oct 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyblish/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


_registered_paths = list()
_registered_callbacks = dict()
_registered_handlers = dict()
_registered_plugins = dict()
_registered_services = dict()
_registered_test = dict()
Expand All @@ -24,7 +24,7 @@
"version_info",
"__version__",
"_registered_paths",
"_registered_callbacks",
"_registered_handlers",
"_registered_plugins",
"_registered_services",
"_registered_test",
Expand Down
35 changes: 25 additions & 10 deletions pyblish/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@
deregister_all_services,
registered_services,

register_callback,
deregister_callback,
deregister_all_callbacks,
registered_callbacks,

sort as sort_plugins,

registered_paths,
Expand All @@ -82,12 +77,19 @@
)

from .lib import (
on,
log,
time as __time,
emit,
main_package_path as __main_package_path
main_package_path as __main_package_path,

register_handler,
deregister_handler,
deregister_all_handlers,
registered_handlers,
)


from .logic import (
plugins_by_family,
plugins_by_host,
Expand Down Expand Up @@ -119,6 +121,11 @@
Selector,
Conformer,
format_filename,

register_callback,
deregister_callback,
deregister_all_callbacks,
registered_callbacks,
)


Expand All @@ -145,6 +152,7 @@ def __init__():
# Register default test
register_test(__default_test)


__init__()


Expand Down Expand Up @@ -197,10 +205,12 @@ def __init__():
"deregister_all_services",
"registered_services",

"register_callback",
"deregister_callback",
"deregister_all_callbacks",
"registered_callbacks",
"on",

"register_handler",
"deregister_handler",
"deregister_all_handlers",
"registered_handlers",

"register_plugin_path",
"deregister_plugin_path",
Expand Down Expand Up @@ -247,4 +257,9 @@ def __init__():
# Compatibility
"deregister_all",
"sort",

"register_callback",
"deregister_callback",
"deregister_all_callbacks",
"registered_callbacks",
]
5 changes: 5 additions & 0 deletions pyblish/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,8 @@ def gen(plugin, instances):
process.next_instance = None

logic.process = process

register_callback = lib.register_handler
deregister_callback = lib.deregister_handler
registered_callbacks = lib.registered_handlers
deregister_all_callbacks = lib.deregister_all_handlers
Loading