From 623d745bcbb01e4ca4a6e7fd8900eb64f881b55b Mon Sep 17 00:00:00 2001 From: ronyhe Date: Sat, 28 Jul 2018 09:47:37 +0300 Subject: [PATCH] Belongs to previous commit --- pyjvm/instructions/instructions.py | 1 + pyjvm/model/class_loaders.py | 3 +-- test/conftest.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyjvm/instructions/instructions.py b/pyjvm/instructions/instructions.py index a69135f..1393214 100644 --- a/pyjvm/instructions/instructions.py +++ b/pyjvm/instructions/instructions.py @@ -172,6 +172,7 @@ def execute(self): name = self.instruction.mnemonic raise NotImplementedError(f'The {name} instruction is not implemented by this jvm') + # Uh-Oh, we broke a rule. # The `Instructor` sub classes use elements defined in this module. # So they have to be imported after those definitions. diff --git a/pyjvm/model/class_loaders.py b/pyjvm/model/class_loaders.py index b9e5d93..9e3a731 100644 --- a/pyjvm/model/class_loaders.py +++ b/pyjvm/model/class_loaders.py @@ -1,9 +1,8 @@ -import jawa +from jawa.classloader import ClassLoader as JawaLoader from pyjvm.model.jvm_class import JvmObject from pyjvm.model.jvm_types import RootObjectType, ObjectReferenceType from pyjvm.utils.jawa_conversions import convert_class_file -from jawa.classloader import ClassLoader as JawaLoader def _name_and_default_value(pair): diff --git a/test/conftest.py b/test/conftest.py index 4b47cc9..47cd293 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -3,7 +3,7 @@ The main point is to add a command line argument for testing. Namely a path to a Java Standard Library. I don't know much about py.test internals, so this is copied almost verbatim from the py.test documentation. -See +See https://docs.pytest.org/en/latest/example/simple.html """ import pytest