From 6c958e4a485e747c55abf3b59661e8f0287d1181 Mon Sep 17 00:00:00 2001 From: Jerome Leclanche Date: Tue, 6 Feb 2018 21:56:16 +0200 Subject: [PATCH] Clean up imports --- bin/unity2yaml | 6 ++++-- bin/unityextract | 3 ++- unitypack/asset.py | 3 ++- unitypack/assetbundle.py | 1 + unitypack/engine/animation.py | 1 + unitypack/engine/audio.py | 1 + unitypack/engine/font.py | 2 +- unitypack/engine/movie.py | 3 +-- unitypack/engine/physics.py | 1 + unitypack/engine/renderer.py | 1 + unitypack/engine/text.py | 1 + unitypack/engine/texture.py | 2 ++ unitypack/environment.py | 1 + unitypack/export.py | 1 + unitypack/object.py | 2 +- unitypack/resources.py | 2 +- unitypack/type.py | 3 ++- 17 files changed, 24 insertions(+), 10 deletions(-) diff --git a/bin/unity2yaml b/bin/unity2yaml index a6c49a2..e83bb35 100755 --- a/bin/unity2yaml +++ b/bin/unity2yaml @@ -1,9 +1,11 @@ #!/usr/bin/env python import os import sys -import unitypack -import yaml from argparse import ArgumentParser + +import yaml + +import unitypack from unitypack.asset import Asset from unitypack.object import ObjectPointer diff --git a/bin/unityextract b/bin/unityextract index 01c03e1..3056b0c 100755 --- a/bin/unityextract +++ b/bin/unityextract @@ -2,9 +2,10 @@ import os import pickle import sys -import unitypack from argparse import ArgumentParser from io import BytesIO + +import unitypack from unitypack.asset import Asset from unitypack.export import OBJMesh from unitypack.utils import extract_audioclip_samples diff --git a/unitypack/asset.py b/unitypack/asset.py index 2cccbb9..7f25b7c 100644 --- a/unitypack/asset.py +++ b/unitypack/asset.py @@ -1,9 +1,10 @@ -import os import logging import lzma +import os from binascii import hexlify from io import BytesIO from uuid import UUID + from .object import ObjectInfo from .type import TypeMetadata from .utils import BinaryReader diff --git a/unitypack/assetbundle.py b/unitypack/assetbundle.py index a1a7903..4c5a77c 100644 --- a/unitypack/assetbundle.py +++ b/unitypack/assetbundle.py @@ -1,6 +1,7 @@ import lzma import struct from io import BytesIO + from .asset import Asset from .enums import CompressionType from .utils import BinaryReader, lz4_decompress diff --git a/unitypack/engine/animation.py b/unitypack/engine/animation.py index 1732e40..d9607c1 100644 --- a/unitypack/engine/animation.py +++ b/unitypack/engine/animation.py @@ -1,4 +1,5 @@ from enum import IntEnum + from .component import Behaviour, Component from .object import Object, field diff --git a/unitypack/engine/audio.py b/unitypack/engine/audio.py index 374d392..f92be82 100644 --- a/unitypack/engine/audio.py +++ b/unitypack/engine/audio.py @@ -1,5 +1,6 @@ import logging from enum import IntEnum + from .component import Behaviour from .object import Object, field diff --git a/unitypack/engine/font.py b/unitypack/engine/font.py index b50eb03..52c5256 100644 --- a/unitypack/engine/font.py +++ b/unitypack/engine/font.py @@ -1,4 +1,4 @@ -from .object import field, Object +from .object import Object, field class Font(Object): diff --git a/unitypack/engine/movie.py b/unitypack/engine/movie.py index 75fa277..a8aec1a 100644 --- a/unitypack/engine/movie.py +++ b/unitypack/engine/movie.py @@ -1,6 +1,5 @@ -from enum import IntEnum -from .texture import Texture from .object import field +from .texture import Texture class MovieTexture(Texture): diff --git a/unitypack/engine/physics.py b/unitypack/engine/physics.py index b06f306..bb3511d 100644 --- a/unitypack/engine/physics.py +++ b/unitypack/engine/physics.py @@ -1,4 +1,5 @@ from enum import IntEnum + from .component import Behaviour, Component from .object import field diff --git a/unitypack/engine/renderer.py b/unitypack/engine/renderer.py index 8de03b2..d5c836f 100644 --- a/unitypack/engine/renderer.py +++ b/unitypack/engine/renderer.py @@ -1,4 +1,5 @@ from enum import IntEnum + from .component import Component from .object import field diff --git a/unitypack/engine/text.py b/unitypack/engine/text.py index a98d72e..af2b369 100644 --- a/unitypack/engine/text.py +++ b/unitypack/engine/text.py @@ -1,4 +1,5 @@ from enum import IntEnum + from .component import Component from .object import Object, field diff --git a/unitypack/engine/texture.py b/unitypack/engine/texture.py index 222b6d9..35a3b21 100644 --- a/unitypack/engine/texture.py +++ b/unitypack/engine/texture.py @@ -1,4 +1,6 @@ +import logging from enum import IntEnum + from .object import Object, field diff --git a/unitypack/environment.py b/unitypack/environment.py index ba8b68c..0829e7f 100644 --- a/unitypack/environment.py +++ b/unitypack/environment.py @@ -1,5 +1,6 @@ import os from urllib.parse import urlparse + from .asset import Asset from .assetbundle import AssetBundle diff --git a/unitypack/export.py b/unitypack/export.py index 3382090..5337bbb 100644 --- a/unitypack/export.py +++ b/unitypack/export.py @@ -1,4 +1,5 @@ from io import BytesIO + from .utils import BinaryReader diff --git a/unitypack/object.py b/unitypack/object.py index 22a3ded..6a04ca9 100644 --- a/unitypack/object.py +++ b/unitypack/object.py @@ -1,6 +1,6 @@ -import logging from collections import OrderedDict from io import BytesIO + from . import engine as UnityEngine from .resources import UnityClass from .type import TypeMetadata, TypeTree diff --git a/unitypack/resources.py b/unitypack/resources.py index ccee017..3db3829 100644 --- a/unitypack/resources.py +++ b/unitypack/resources.py @@ -1,5 +1,5 @@ -import os import json +import os def get_resource(name): diff --git a/unitypack/type.py b/unitypack/type.py index 58e2c93..fab49a0 100644 --- a/unitypack/type.py +++ b/unitypack/type.py @@ -1,6 +1,7 @@ from io import BytesIO + from .enums import RuntimePlatform -from .resources import get_resource, STRINGS_DAT +from .resources import STRINGS_DAT, get_resource from .utils import BinaryReader