summaryrefslogtreecommitdiff
path: root/reader.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 /reader.py
parent5bccee8a4c79f291e54b73f8f2bc0b711994f81f (diff)
downloadruamel.yaml-d444338e4438323535476461414e1652bdd75cb3.tar.gz
Jython compatibility
Diffstat (limited to 'reader.py')
-rw-r--r--reader.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/reader.py b/reader.py
index 7bbec42..5248380 100644
--- a/reader.py
+++ b/reader.py
@@ -23,8 +23,13 @@ __all__ = ['Reader', 'ReaderError']
import codecs
import re
-from .error import YAMLError, Mark
-from .compat import text_type, binary_type, PY3
+try:
+ from .error import YAMLError, Mark
+ from .compat import text_type, binary_type, PY3
+except (ImportError, ValueError): # for Jython
+ from ruamel.yaml.error import YAMLError, Mark
+ from ruamel.yaml.compat import text_type, binary_type, PY3
+
class ReaderError(YAMLError):