diff --git a/src/io_scene_vrm/common/deep.py b/src/io_scene_vrm/common/deep.py index d127d5cce..d7e9e6e43 100644 --- a/src/io_scene_vrm/common/deep.py +++ b/src/io_scene_vrm/common/deep.py @@ -5,7 +5,7 @@ from . import convert from .convert import Json -from .logging import get_logger +from .logger import get_logger logger = get_logger(__name__) diff --git a/src/io_scene_vrm/common/human_bone_mapper/human_bone_mapper.py b/src/io_scene_vrm/common/human_bone_mapper/human_bone_mapper.py index f6388ca8e..e6d822490 100644 --- a/src/io_scene_vrm/common/human_bone_mapper/human_bone_mapper.py +++ b/src/io_scene_vrm/common/human_bone_mapper/human_bone_mapper.py @@ -3,7 +3,7 @@ from bpy.types import Armature, Object -from ..logging import get_logger +from ..logger import get_logger from ..vrm1.human_bone import HumanBoneSpecification from . import ( cats_blender_plugin_fix_model_mapping, diff --git a/src/io_scene_vrm/common/human_bone_mapper/mmd_mapping.py b/src/io_scene_vrm/common/human_bone_mapper/mmd_mapping.py index 6959572b0..67b7a232f 100644 --- a/src/io_scene_vrm/common/human_bone_mapper/mmd_mapping.py +++ b/src/io_scene_vrm/common/human_bone_mapper/mmd_mapping.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT OR GPL-3.0-or-later from bpy.types import Object -from ..logging import get_logger +from ..logger import get_logger from ..vrm1.human_bone import HumanBoneSpecification, HumanBoneSpecifications logger = get_logger(__name__) diff --git a/src/io_scene_vrm/common/logging.py b/src/io_scene_vrm/common/logger.py similarity index 77% rename from src/io_scene_vrm/common/logging.py rename to src/io_scene_vrm/common/logger.py index 4a949040d..e9755afd5 100644 --- a/src/io_scene_vrm/common/logging.py +++ b/src/io_scene_vrm/common/logger.py @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT OR GPL-3.0-or-later -import logging as standard_logging +import logging import sys from collections.abc import Mapping from os import environ @@ -10,9 +10,9 @@ # https://github.com/python/typeshed/issues/7855 if TYPE_CHECKING or sys.version_info >= (3, 11): - LoggerAdapter = standard_logging.LoggerAdapter[standard_logging.Logger] + LoggerAdapter = logging.LoggerAdapter[logging.Logger] else: - LoggerAdapter = standard_logging.LoggerAdapter + LoggerAdapter = logging.LoggerAdapter class VrmAddonLoggerAdapter(LoggerAdapter): @@ -36,7 +36,7 @@ def log( **kwargs: object, ) -> None: # https://github.com/saturday06/VRM-Addon-for-Blender/blob/2_20_36/src/io_scene_vrm/__init__.py#L132-L134 - level_name = standard_logging.getLevelName(level) + level_name = logging.getLevelName(level) super().log( level, f"[VRM Add-on:{level_name}] {msg}", @@ -51,9 +51,9 @@ def log( # https://docs.python.org/3.7/library/logging.html#logging.getLogger def get_logger(name: str) -> LoggerAdapter: - logger = standard_logging.getLogger(name) + logger = logging.getLogger(name) if bpy.app.debug or environ.get("BLENDER_VRM_LOGGING_LEVEL_DEBUG") == "yes": - logger.setLevel(min(standard_logging.DEBUG, logger.getEffectiveLevel())) + logger.setLevel(min(logging.DEBUG, logger.getEffectiveLevel())) else: - logger.setLevel(max(standard_logging.INFO, logger.getEffectiveLevel())) + logger.setLevel(max(logging.INFO, logger.getEffectiveLevel())) return VrmAddonLoggerAdapter(logger, {}) diff --git a/src/io_scene_vrm/common/preferences.py b/src/io_scene_vrm/common/preferences.py index 45360ed9d..a2526c7dc 100644 --- a/src/io_scene_vrm/common/preferences.py +++ b/src/io_scene_vrm/common/preferences.py @@ -6,7 +6,7 @@ from bpy.types import AddonPreferences, Context, Operator, UILayout from . import version -from .logging import get_logger +from .logger import get_logger logger = get_logger(__name__) diff --git a/src/io_scene_vrm/common/progress.py b/src/io_scene_vrm/common/progress.py index daed055e9..dcf877c8a 100644 --- a/src/io_scene_vrm/common/progress.py +++ b/src/io_scene_vrm/common/progress.py @@ -7,7 +7,7 @@ from bpy.types import Context -from .logging import get_logger +from .logger import get_logger logger = get_logger(__name__) diff --git a/src/io_scene_vrm/common/rotation.py b/src/io_scene_vrm/common/rotation.py index 2669161d6..13ab3f09a 100644 --- a/src/io_scene_vrm/common/rotation.py +++ b/src/io_scene_vrm/common/rotation.py @@ -7,7 +7,7 @@ ) from mathutils import Quaternion -from .logging import get_logger +from .logger import get_logger logger = get_logger(__name__) diff --git a/src/io_scene_vrm/common/shader.py b/src/io_scene_vrm/common/shader.py index c4d6496d5..777524a3e 100644 --- a/src/io_scene_vrm/common/shader.py +++ b/src/io_scene_vrm/common/shader.py @@ -96,7 +96,7 @@ from . import convert from .char import INTERNAL_NAME_PREFIX from .gl import GL_CLAMP_TO_EDGE, GL_LINEAR, GL_NEAREST, GL_REPEAT -from .logging import get_logger +from .logger import get_logger from .version import get_addon_version from .workspace import save_workspace, wm_append_without_library diff --git a/src/io_scene_vrm/common/version.py b/src/io_scene_vrm/common/version.py index 9cc2df22e..9e3d64e5d 100644 --- a/src/io_scene_vrm/common/version.py +++ b/src/io_scene_vrm/common/version.py @@ -8,7 +8,7 @@ from bpy.app.translations import pgettext from .blender_manifest import BlenderManifest -from .logging import get_logger +from .logger import get_logger logger = get_logger(__name__) diff --git a/src/io_scene_vrm/editor/extension.py b/src/io_scene_vrm/editor/extension.py index 7ccf23c53..5bf85c2a8 100644 --- a/src/io_scene_vrm/editor/extension.py +++ b/src/io_scene_vrm/editor/extension.py @@ -23,7 +23,7 @@ ) from mathutils import Matrix, Quaternion -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.preferences import VrmAddonPreferences from .mtoon1.property_group import Mtoon1MaterialPropertyGroup from .node_constraint1.property_group import NodeConstraint1NodeConstraintPropertyGroup diff --git a/src/io_scene_vrm/editor/migration.py b/src/io_scene_vrm/editor/migration.py index 86c9c417b..11f9bdb97 100644 --- a/src/io_scene_vrm/editor/migration.py +++ b/src/io_scene_vrm/editor/migration.py @@ -7,7 +7,7 @@ from bpy.types import Armature, Context from ..common import ops -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.preferences import get_preferences from ..common.version import get_addon_version from .extension import ( diff --git a/src/io_scene_vrm/editor/mtoon1/handler.py b/src/io_scene_vrm/editor/mtoon1/handler.py index 7ce53e28c..7a475fbe1 100644 --- a/src/io_scene_vrm/editor/mtoon1/handler.py +++ b/src/io_scene_vrm/editor/mtoon1/handler.py @@ -7,7 +7,7 @@ from bpy.app.handlers import persistent from bpy.types import Mesh -from ...common.logging import get_logger +from ...common.logger import get_logger from ..extension import get_material_extension from . import migration from .ops import VRM_OT_refresh_mtoon1_outline diff --git a/src/io_scene_vrm/editor/mtoon1/migration.py b/src/io_scene_vrm/editor/mtoon1/migration.py index 9c0895e21..8e912814f 100644 --- a/src/io_scene_vrm/editor/mtoon1/migration.py +++ b/src/io_scene_vrm/editor/mtoon1/migration.py @@ -16,7 +16,7 @@ from ...common import convert, ops, shader, version from ...common.gl import GL_LINEAR, GL_NEAREST -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.progress import create_progress from .. import search from ..extension import get_material_extension diff --git a/src/io_scene_vrm/editor/mtoon1/ops.py b/src/io_scene_vrm/editor/mtoon1/ops.py index e6a36194e..2ebe49cc3 100644 --- a/src/io_scene_vrm/editor/mtoon1/ops.py +++ b/src/io_scene_vrm/editor/mtoon1/ops.py @@ -24,7 +24,7 @@ from bpy_extras.node_shader_utils import PrincipledBSDFWrapper from ...common import convert, shader -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.preferences import get_preferences from .. import search from ..extension import get_material_extension diff --git a/src/io_scene_vrm/editor/mtoon1/panel.py b/src/io_scene_vrm/editor/mtoon1/panel.py index c0412ea22..b7c89b70a 100644 --- a/src/io_scene_vrm/editor/mtoon1/panel.py +++ b/src/io_scene_vrm/editor/mtoon1/panel.py @@ -5,7 +5,7 @@ from bpy.app.translations import pgettext from bpy.types import Context, Panel, PropertyGroup, UILayout -from ...common.logging import get_logger +from ...common.logger import get_logger from .. import search from ..extension import get_material_extension from ..ops import VRM_OT_open_url_in_web_browser, layout_operator diff --git a/src/io_scene_vrm/editor/mtoon1/property_group.py b/src/io_scene_vrm/editor/mtoon1/property_group.py index 87fe77c9d..17b0cd460 100644 --- a/src/io_scene_vrm/editor/mtoon1/property_group.py +++ b/src/io_scene_vrm/editor/mtoon1/property_group.py @@ -49,7 +49,7 @@ GL_NEAREST_MIPMAP_NEAREST, GL_REPEAT, ) -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.preferences import VrmAddonPreferences from ...common.version import get_addon_version from ..property_group import property_group_enum diff --git a/src/io_scene_vrm/editor/property_group.py b/src/io_scene_vrm/editor/property_group.py index 717fc8e50..380acaaa0 100644 --- a/src/io_scene_vrm/editor/property_group.py +++ b/src/io_scene_vrm/editor/property_group.py @@ -8,7 +8,7 @@ from bpy.props import FloatProperty, PointerProperty, StringProperty from bpy.types import Armature, Bone, Material, Object, PropertyGroup -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.vrm0 import human_bone as vrm0_human_bone from ..common.vrm1 import human_bone as vrm1_human_bone diff --git a/src/io_scene_vrm/editor/search.py b/src/io_scene_vrm/editor/search.py index 3f10b3a19..367833b0e 100644 --- a/src/io_scene_vrm/editor/search.py +++ b/src/io_scene_vrm/editor/search.py @@ -21,7 +21,7 @@ ShaderNodeOutputMaterial, ) -from ..common.logging import get_logger +from ..common.logger import get_logger from .extension import get_armature_extension logger = get_logger(__name__) diff --git a/src/io_scene_vrm/editor/spring_bone1/property_group.py b/src/io_scene_vrm/editor/spring_bone1/property_group.py index cff0e4f36..a403aaafe 100644 --- a/src/io_scene_vrm/editor/spring_bone1/property_group.py +++ b/src/io_scene_vrm/editor/spring_bone1/property_group.py @@ -20,7 +20,7 @@ from mathutils import Matrix, Quaternion, Vector from ...common import convert -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.rotation import ( get_rotation_as_quaternion, set_rotation_without_mode_change, diff --git a/src/io_scene_vrm/editor/spring_bone1/ui_list.py b/src/io_scene_vrm/editor/spring_bone1/ui_list.py index 6e8c280e5..014423bed 100644 --- a/src/io_scene_vrm/editor/spring_bone1/ui_list.py +++ b/src/io_scene_vrm/editor/spring_bone1/ui_list.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT OR GPL-3.0-or-later from bpy.types import Context, UILayout, UIList -from ...common.logging import get_logger +from ...common.logger import get_logger from ..extension import get_armature_extension from .property_group import ( SpringBone1ColliderGroupPropertyGroup, diff --git a/src/io_scene_vrm/editor/subscription.py b/src/io_scene_vrm/editor/subscription.py index c1babe13d..1071b4969 100644 --- a/src/io_scene_vrm/editor/subscription.py +++ b/src/io_scene_vrm/editor/subscription.py @@ -4,7 +4,7 @@ import bpy from bpy.types import Armature, Bone, Object -from ..common.logging import get_logger +from ..common.logger import get_logger from .migration import ( on_change_bpy_armature_name, on_change_bpy_bone_name, diff --git a/src/io_scene_vrm/editor/t_pose.py b/src/io_scene_vrm/editor/t_pose.py index 9d0efc2b6..d03e5e739 100644 --- a/src/io_scene_vrm/editor/t_pose.py +++ b/src/io_scene_vrm/editor/t_pose.py @@ -17,7 +17,7 @@ from mathutils import Euler, Matrix, Quaternion, Vector from ..common import ops -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.rotation import ( get_rotation_as_quaternion, set_rotation_without_mode_change, diff --git a/src/io_scene_vrm/editor/validation.py b/src/io_scene_vrm/editor/validation.py index 1594bf70f..f8fd147e0 100644 --- a/src/io_scene_vrm/editor/validation.py +++ b/src/io_scene_vrm/editor/validation.py @@ -25,7 +25,7 @@ from ..common import shader, version from ..common.legacy_gltf import RGBA_INPUT_NAMES, TEXTURE_INPUT_NAMES, VAL_INPUT_NAMES -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.mtoon_unversioned import MtoonUnversioned from ..common.preferences import get_preferences from ..common.vrm0 import human_bone as vrm0_human_bone diff --git a/src/io_scene_vrm/editor/vrm0/handler.py b/src/io_scene_vrm/editor/vrm0/handler.py index 85b6f595a..3dfdc43c0 100644 --- a/src/io_scene_vrm/editor/vrm0/handler.py +++ b/src/io_scene_vrm/editor/vrm0/handler.py @@ -2,7 +2,7 @@ import bpy from bpy.app.handlers import persistent -from ...common.logging import get_logger +from ...common.logger import get_logger from .property_group import Vrm0BlendShapeGroupPropertyGroup logger = get_logger(__name__) diff --git a/src/io_scene_vrm/editor/vrm0/property_group.py b/src/io_scene_vrm/editor/vrm0/property_group.py index efef40aa8..2b6aec18e 100644 --- a/src/io_scene_vrm/editor/vrm0/property_group.py +++ b/src/io_scene_vrm/editor/vrm0/property_group.py @@ -27,7 +27,7 @@ ) from mathutils import Vector -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.vrm0.human_bone import ( HumanBoneName, HumanBoneSpecification, diff --git a/src/io_scene_vrm/editor/vrm1/handler.py b/src/io_scene_vrm/editor/vrm1/handler.py index 56e5537c4..7f5cd319f 100644 --- a/src/io_scene_vrm/editor/vrm1/handler.py +++ b/src/io_scene_vrm/editor/vrm1/handler.py @@ -6,7 +6,7 @@ from bpy.app.handlers import persistent from mathutils import Vector -from ...common.logging import get_logger +from ...common.logger import get_logger from ..extension import get_armature_extension from .property_group import Vrm1ExpressionPropertyGroup, Vrm1LookAtPropertyGroup diff --git a/src/io_scene_vrm/editor/vrm1/ops.py b/src/io_scene_vrm/editor/vrm1/ops.py index 94edaad37..a39edfe45 100644 --- a/src/io_scene_vrm/editor/vrm1/ops.py +++ b/src/io_scene_vrm/editor/vrm1/ops.py @@ -27,7 +27,7 @@ from ...common import ops, shader from ...common.human_bone_mapper.human_bone_mapper import create_human_bone_mapping -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.vrm0.human_bone import HumanBoneName as Vrm0HumanBoneName from ...common.vrm1.human_bone import HumanBoneName, HumanBoneSpecifications from ..extension import get_armature_extension diff --git a/src/io_scene_vrm/editor/vrm1/panel.py b/src/io_scene_vrm/editor/vrm1/panel.py index 874baa156..483393e0f 100644 --- a/src/io_scene_vrm/editor/vrm1/panel.py +++ b/src/io_scene_vrm/editor/vrm1/panel.py @@ -5,7 +5,7 @@ from bpy.app.translations import pgettext from bpy.types import Armature, Context, Mesh, Object, Panel, UILayout -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.vrm1.human_bone import HumanBoneSpecifications from .. import ops, search from ..extension import get_armature_extension, get_bone_extension diff --git a/src/io_scene_vrm/editor/vrm1/property_group.py b/src/io_scene_vrm/editor/vrm1/property_group.py index db66a7e6f..79296d2e8 100644 --- a/src/io_scene_vrm/editor/vrm1/property_group.py +++ b/src/io_scene_vrm/editor/vrm1/property_group.py @@ -32,7 +32,7 @@ from mathutils import Matrix, Quaternion, Vector from ...common.char import DISABLE_TRANSLATION -from ...common.logging import get_logger +from ...common.logger import get_logger from ...common.rotation import set_rotation_without_mode_change from ...common.vrm1.human_bone import ( HumanBoneName, diff --git a/src/io_scene_vrm/editor/vrm1/ui_list.py b/src/io_scene_vrm/editor/vrm1/ui_list.py index 5f8c5221b..52a3d265c 100644 --- a/src/io_scene_vrm/editor/vrm1/ui_list.py +++ b/src/io_scene_vrm/editor/vrm1/ui_list.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT OR GPL-3.0-or-later from bpy.types import Context, Mesh, UILayout, UIList -from ...common.logging import get_logger +from ...common.logger import get_logger from ..property_group import StringPropertyGroup from .property_group import ( Vrm1ExpressionsPropertyGroup, diff --git a/src/io_scene_vrm/exporter/abstract_base_vrm_exporter.py b/src/io_scene_vrm/exporter/abstract_base_vrm_exporter.py index 5294c538f..49b509777 100644 --- a/src/io_scene_vrm/exporter/abstract_base_vrm_exporter.py +++ b/src/io_scene_vrm/exporter/abstract_base_vrm_exporter.py @@ -12,7 +12,7 @@ from ..common import shader from ..common.convert import Json from ..common.deep import make_json -from ..common.logging import get_logger +from ..common.logger import get_logger from ..editor.extension import get_armature_extension, get_material_extension from ..editor.search import MESH_CONVERTIBLE_OBJECT_TYPES from ..external import io_scene_gltf2_support diff --git a/src/io_scene_vrm/exporter/export_scene.py b/src/io_scene_vrm/exporter/export_scene.py index 042a928dc..406039b05 100644 --- a/src/io_scene_vrm/exporter/export_scene.py +++ b/src/io_scene_vrm/exporter/export_scene.py @@ -19,7 +19,7 @@ from bpy_extras.io_utils import ExportHelper from ..common import ops, version -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.preferences import ( ExportPreferencesProtocol, copy_export_preferences, diff --git a/src/io_scene_vrm/exporter/vrm0_exporter.py b/src/io_scene_vrm/exporter/vrm0_exporter.py index 96dd83bf4..8b1a6ccac 100644 --- a/src/io_scene_vrm/exporter/vrm0_exporter.py +++ b/src/io_scene_vrm/exporter/vrm0_exporter.py @@ -47,7 +47,7 @@ FLOAT_POSITIVE_MAX, ) from ..common.legacy_gltf import TEXTURE_INPUT_NAMES -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.mtoon_unversioned import MtoonUnversioned from ..common.progress import Progress, create_progress from ..common.version import get_addon_version diff --git a/src/io_scene_vrm/exporter/vrm1_exporter.py b/src/io_scene_vrm/exporter/vrm1_exporter.py index d0f3eac7a..9f5cba63a 100644 --- a/src/io_scene_vrm/exporter/vrm1_exporter.py +++ b/src/io_scene_vrm/exporter/vrm1_exporter.py @@ -36,7 +36,7 @@ from ..common.convert import Json from ..common.deep import make_json from ..common.gltf import pack_glb, parse_glb -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.rotation import ( ROTATION_MODE_EULER, get_rotation_as_quaternion, diff --git a/src/io_scene_vrm/exporter/vrm_animation_exporter.py b/src/io_scene_vrm/exporter/vrm_animation_exporter.py index 8ad36e347..c993af7c9 100644 --- a/src/io_scene_vrm/exporter/vrm_animation_exporter.py +++ b/src/io_scene_vrm/exporter/vrm_animation_exporter.py @@ -13,7 +13,7 @@ from ..common.deep import make_json from ..common.gl import GL_FLOAT from ..common.gltf import pack_glb -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.rotation import ( ROTATION_MODE_AXIS_ANGLE, ROTATION_MODE_EULER, diff --git a/src/io_scene_vrm/external/io_scene_gltf2_support.py b/src/io_scene_vrm/external/io_scene_gltf2_support.py index c8631bfdb..d80adcdb8 100644 --- a/src/io_scene_vrm/external/io_scene_gltf2_support.py +++ b/src/io_scene_vrm/external/io_scene_gltf2_support.py @@ -8,7 +8,7 @@ import bpy from bpy.types import Context, Event, Image, Operator -from ..common.logging import get_logger +from ..common.logger import get_logger # # `import io_scene_gltf2` is executed in a function, not here. Importing it in the diff --git a/src/io_scene_vrm/importer/abstract_base_vrm_importer.py b/src/io_scene_vrm/importer/abstract_base_vrm_importer.py index c292169c7..abcebf74b 100644 --- a/src/io_scene_vrm/importer/abstract_base_vrm_importer.py +++ b/src/io_scene_vrm/importer/abstract_base_vrm_importer.py @@ -40,7 +40,7 @@ ) from ..common.gl import GL_FLOAT, GL_LINEAR, GL_REPEAT, GL_UNSIGNED_SHORT from ..common.gltf import FLOAT_NEGATIVE_MAX, FLOAT_POSITIVE_MAX, pack_glb, parse_glb -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.preferences import ImportPreferencesProtocol from ..common.progress import PartialProgress, create_progress from ..common.rotation import ( diff --git a/src/io_scene_vrm/importer/gltf2_addon_importer_user_extension.py b/src/io_scene_vrm/importer/gltf2_addon_importer_user_extension.py index a7d02bc5e..d7430839a 100644 --- a/src/io_scene_vrm/importer/gltf2_addon_importer_user_extension.py +++ b/src/io_scene_vrm/importer/gltf2_addon_importer_user_extension.py @@ -6,7 +6,7 @@ from bpy.types import Image from ..common.convert import sequence_or_none -from ..common.logging import get_logger +from ..common.logger import get_logger logger = get_logger(__name__) diff --git a/src/io_scene_vrm/importer/import_scene.py b/src/io_scene_vrm/importer/import_scene.py index 8fbbaaeee..147230a46 100644 --- a/src/io_scene_vrm/importer/import_scene.py +++ b/src/io_scene_vrm/importer/import_scene.py @@ -19,7 +19,7 @@ from bpy_extras.io_utils import ImportHelper from ..common import ops, version -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.preferences import ( ImportPreferencesProtocol, copy_import_preferences, diff --git a/src/io_scene_vrm/importer/vrm0_importer.py b/src/io_scene_vrm/importer/vrm0_importer.py index 60820e56b..fa0c4e1e9 100644 --- a/src/io_scene_vrm/importer/vrm0_importer.py +++ b/src/io_scene_vrm/importer/vrm0_importer.py @@ -19,7 +19,7 @@ from ..common import convert, shader from ..common.convert import Json -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.preferences import get_preferences from ..common.progress import PartialProgress from ..common.version import get_addon_version diff --git a/src/io_scene_vrm/importer/vrm1_importer.py b/src/io_scene_vrm/importer/vrm1_importer.py index 02509e66e..fa29c0954 100644 --- a/src/io_scene_vrm/importer/vrm1_importer.py +++ b/src/io_scene_vrm/importer/vrm1_importer.py @@ -17,7 +17,7 @@ from ..common import convert, ops, shader from ..common.convert import Json -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.preferences import get_preferences from ..common.progress import PartialProgress from ..common.version import get_addon_version diff --git a/src/io_scene_vrm/importer/vrm_animation_importer.py b/src/io_scene_vrm/importer/vrm_animation_importer.py index b4244d9e1..ff86a419f 100644 --- a/src/io_scene_vrm/importer/vrm_animation_importer.py +++ b/src/io_scene_vrm/importer/vrm_animation_importer.py @@ -16,7 +16,7 @@ read_accessor_as_animation_sampler_rotation_output, read_accessor_as_animation_sampler_translation_output, ) -from ..common.logging import get_logger +from ..common.logger import get_logger from ..common.rotation import ( get_rotation_as_quaternion, insert_rotation_keyframe, diff --git a/src/io_scene_vrm/registration.py b/src/io_scene_vrm/registration.py index 35d1006f5..5d729690c 100644 --- a/src/io_scene_vrm/registration.py +++ b/src/io_scene_vrm/registration.py @@ -28,7 +28,7 @@ ) from .common import preferences, shader -from .common.logging import get_logger +from .common.logger import get_logger from .common.version import trigger_clear_addon_version_cache from .editor import ( extension, diff --git a/tests/blender_test_import_export.py b/tests/blender_test_import_export.py index bd4eef633..34561cedf 100644 --- a/tests/blender_test_import_export.py +++ b/tests/blender_test_import_export.py @@ -8,7 +8,7 @@ from bpy.types import Context from io_scene_vrm.common import ops -from io_scene_vrm.common.logging import get_logger +from io_scene_vrm.common.logger import get_logger from io_scene_vrm.importer.vrm_diff import vrm_diff logger = get_logger(__name__)