Skip to content

Commit

Permalink
Belongs to previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
ronyhe committed Jul 28, 2018
1 parent db10fa8 commit 623d745
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions pyjvm/instructions/instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions pyjvm/model/class_loaders.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 623d745

Please sign in to comment.