From d444338e4438323535476461414e1652bdd75cb3 Mon Sep 17 00:00:00 2001 From: Anthon van der Neut Date: Thu, 8 Oct 2015 13:24:36 +0200 Subject: Jython compatibility --- serializer.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'serializer.py') diff --git a/serializer.py b/serializer.py index 0bdc558..125729e 100644 --- a/serializer.py +++ b/serializer.py @@ -4,11 +4,17 @@ __all__ = ['Serializer', 'SerializerError'] import re -from .error import YAMLError -from .events import * -from .nodes import * +try: + from .error import YAMLError + from .events import * + from .nodes import * + from .compat import nprint, DBG_NODE, dbg +except (ImportError, ValueError): # for Jython + from ruamel.yaml.error import YAMLError + from ruamel.yaml.events import * + from ruamel.yaml.nodes import * + from ruamel.yaml.compat import nprint, DBG_NODE, dbg -from .compat import nprint, DBG_NODE, dbg class SerializerError(YAMLError): @@ -163,4 +169,4 @@ class Serializer(object): self.ascend_resolver() def templated_id(s): - return Serializer.ANCHOR_RE.match(s) \ No newline at end of file + return Serializer.ANCHOR_RE.match(s) -- cgit v1.2.1