From 4ed2215c3f3327cef9288b493e19b8b3ce62186d Mon Sep 17 00:00:00 2001 From: Rick Rongen Date: Mon, 3 Feb 2020 19:46:41 +0100 Subject: [PATCH] chore: reformatted all files --- pjvm/classloader.py | 1 - pjvm/clazz.py | 2 +- pjvm/opcodes.py | 4 ++-- pjvm/stackframe.py | 4 ++-- pjvm/unpacker.py | 4 ++-- pjvm/utils.py | 1 - 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pjvm/classloader.py b/pjvm/classloader.py index b420f38..6180add 100644 --- a/pjvm/classloader.py +++ b/pjvm/classloader.py @@ -1,5 +1,4 @@ import logging - from typing import BinaryIO, IO, Union from .unpacker import Unpacker diff --git a/pjvm/clazz.py b/pjvm/clazz.py index 6bc97c6..ec5caa8 100644 --- a/pjvm/clazz.py +++ b/pjvm/clazz.py @@ -2,7 +2,7 @@ import collections import enum import logging import struct -from typing import Dict, List, Optional, Union, Tuple +from typing import Dict, List, Optional, Tuple, Union from pjvm.unpacker import Unpacker from .classloader import ClassLoader diff --git a/pjvm/opcodes.py b/pjvm/opcodes.py index 3df87e4..4158a11 100644 --- a/pjvm/opcodes.py +++ b/pjvm/opcodes.py @@ -1,8 +1,8 @@ from logging import getLogger -from typing import Callable, Dict, List, Optional, Tuple, Union, TYPE_CHECKING +from typing import Callable, Dict, List, Optional, TYPE_CHECKING, Tuple, Union from . import utils -from .exceptions import PJVMTypeError, PJVMNotImplemented +from .exceptions import PJVMNotImplemented, PJVMTypeError from .old_jtypes import JInteger, JObj, JString from .stackframe import Frame diff --git a/pjvm/stackframe.py b/pjvm/stackframe.py index 140f1b5..b0fc90a 100644 --- a/pjvm/stackframe.py +++ b/pjvm/stackframe.py @@ -1,7 +1,7 @@ import struct from typing import List -from .clazz import Class, Method, Code +from .clazz import Class, Code, Method from .exceptions import PJVMException from .old_jtypes import JObj @@ -36,7 +36,7 @@ class Frame: raise PJVMException("Local out of bound!") self.local_variables[index] = val - def get_local(self, index: int) ->JObj: + def get_local(self, index: int) -> JObj: if index > self.code.max_locals: raise PJVMException("Local out of bound!") val = self.local_variables[index] diff --git a/pjvm/unpacker.py b/pjvm/unpacker.py index 706bca0..bdefd5e 100644 --- a/pjvm/unpacker.py +++ b/pjvm/unpacker.py @@ -1,6 +1,6 @@ from io import BytesIO -from struct import unpack, calcsize -from typing import Dict, BinaryIO +from struct import calcsize, unpack +from typing import BinaryIO, Dict class Unpacker: diff --git a/pjvm/utils.py b/pjvm/utils.py index a140345..a592e20 100644 --- a/pjvm/utils.py +++ b/pjvm/utils.py @@ -1,7 +1,6 @@ from typing import List import re - re_types = re.compile('([BCDFIJSZV]|L(?:[a-zA-Z0-9_]+/)+[a-zA-Z0-9_]+;)') re_method_sig = re.compile(fr"\(({re_types.pattern}*)\){re_types.pattern}")