diff options
author | Anthon van der Neut <anthon@mnt.org> | 2016-08-15 22:46:12 +0200 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2016-08-15 22:46:12 +0200 |
commit | 438db3b9b29e997a6fc2674c95a2c76192b5a567 (patch) | |
tree | c16dc7d660b8d62862564fa669377623adb3a159 /scanner.py | |
parent | 0da1ffde8bf06a1c84693a431aa3de5b02e767b6 (diff) | |
download | ruamel.yaml-0.12.0.tar.gz |
initial type info, drop 2.60.12.0
Diffstat (limited to 'scanner.py')
-rw-r--r-- | scanner.py | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -30,18 +30,12 @@ from __future__ import print_function # # Read comments in the Scanner code for more details. # +from ruamel.yaml.error import MarkedYAMLError +from ruamel.yaml.tokens import * # NOQA +from ruamel.yaml.compat import utf8, unichr, PY3 __all__ = ['Scanner', 'RoundTripScanner', 'ScannerError'] -try: - from .error import MarkedYAMLError - from .tokens import * # NOQA - from .compat import utf8, unichr, PY3 -except (ImportError, ValueError): # for Jython - from ruamel.yaml.error import MarkedYAMLError - from ruamel.yaml.tokens import * # NOQA - from ruamel.yaml.compat import utf8, unichr, PY3 - class ScannerError(MarkedYAMLError): pass |