summaryrefslogtreecommitdiff
path: root/resolver.py
diff options
context:
space:
mode:
authorAnthon van der Neut <anthon@mnt.org>2015-10-08 13:24:36 +0200
committerAnthon van der Neut <anthon@mnt.org>2015-10-08 13:24:36 +0200
commitd444338e4438323535476461414e1652bdd75cb3 (patch)
tree5d89094b84255ca652966457403fcb50d618ba4e /resolver.py
parent5bccee8a4c79f291e54b73f8f2bc0b711994f81f (diff)
downloadruamel.yaml-d444338e4438323535476461414e1652bdd75cb3.tar.gz
Jython compatibility
Diffstat (limited to 'resolver.py')
-rw-r--r--resolver.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/resolver.py b/resolver.py
index d385b0e..bae0caa 100644
--- a/resolver.py
+++ b/resolver.py
@@ -2,9 +2,15 @@ from __future__ import absolute_import
__all__ = ['BaseResolver', 'Resolver']
-from .error import *
-from .nodes import *
-from .compat import string_types
+try:
+ from .error import *
+ from .nodes import *
+ from .compat import string_types
+except (ImportError, ValueError): # for Jython
+ from ruamel.yaml.error import *
+ from ruamel.yaml.nodes import *
+ from ruamel.yaml.compat import string_types
+
import re