Skip to content

Support python3 #2

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

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

Support python3 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91e3d01
fixes #1: builtins change module name python3
flagos Jan 15, 2020
3a77742
fixes #1: ClassType no more in types
flagos Jan 15, 2020
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
10 changes: 5 additions & 5 deletions ProtoText/hook_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import types
import __builtin__
import builtins
import logging

HOOK_TABLE_NAME = '__ZX_PY_HOOK_TABLE__'
Expand All @@ -14,11 +14,11 @@ def register_class_hook(cls, strategy='safe', skip_buildin=True):
:param skip_buildin: determine if we skip the build in object
:return:
"""
assert isinstance(cls, (type, types.ClassType)), \
assert isinstance(cls, type), \
"The input object must be a class object"
base_classes = cls.__bases__
for base_class in base_classes:
if skip_buildin and base_class.__name__ in __builtin__.__dict__:
if skip_buildin and base_class.__name__ in builtins.__dict__:
logger.warn("Skip hooking build-in base class '%s' in sub-class '%s' ..." %
(base_class.__name__, cls.__name__))
continue
Expand Down Expand Up @@ -49,7 +49,7 @@ def deregister_class_hook(cls):
:param cls: the class object of the class to unhook
:return:
"""
assert isinstance(cls, (type, types.ClassType)), \
assert isinstance(cls, type), \
"The input object must be a class object"
base_classes = cls.__bases__
for base_class in base_classes:
Expand All @@ -63,4 +63,4 @@ def deregister_class_hook(cls):
setattr(base_class, x, _hook_table[x])
else:
delattr(base_class, x)
delattr(base_class, HOOK_TABLE_NAME)
delattr(base_class, HOOK_TABLE_NAME)