diff options
| -rw-r--r-- | lib/yaml/__init__.py | 89 | ||||
| -rw-r--r-- | lib/yaml/cyaml.py | 20 | ||||
| -rw-r--r-- | lib/yaml/dumper.py | 10 | ||||
| -rw-r--r-- | lib/yaml/loader.py | 10 | ||||
| -rw-r--r-- | lib3/yaml/__init__.py | 89 | ||||
| -rw-r--r-- | lib3/yaml/cyaml.py | 20 | ||||
| -rw-r--r-- | lib3/yaml/dumper.py | 10 | ||||
| -rw-r--r-- | lib3/yaml/loader.py | 10 | ||||
| -rw-r--r-- | tests/lib/test_constructor.py | 4 | ||||
| -rw-r--r-- | tests/lib/test_recursive.py | 6 | ||||
| -rw-r--r-- | tests/lib3/test_constructor.py | 4 | ||||
| -rw-r--r-- | tests/lib3/test_recursive.py | 6 |
12 files changed, 178 insertions, 100 deletions
diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py index 628eb74..772b1d8 100644 --- a/lib/yaml/__init__.py +++ b/lib/yaml/__init__.py @@ -61,28 +61,22 @@ def compose_all(stream, Loader=Loader): finally: loader.dispose() -def load(stream, Loader=Loader): +# Generic load() and load_all() default to SafeLoader. +def load(stream, Loader=SafeLoader): """ Parse the first YAML document in a stream and produce the corresponding Python object. - - By default resolve only basic YAML tags, if an alternate Loader is - provided, may be dangerous. """ loader = Loader(stream) try: return loader.get_single_data() finally: loader.dispose() -safe_load = load -def load_all(stream, Loader=Loader): +def load_all(stream, Loader=SafeLoader): """ Parse all YAML documents in a stream and produce corresponding Python objects. - - By default resolve only basic YAML tags, if an alternate Loader is - provided, may be dangerous. """ loader = Loader(stream) try: @@ -90,23 +84,41 @@ def load_all(stream, Loader=Loader): yield loader.get_data() finally: loader.dispose() -safe_load_all = load_all -def danger_load(stream): +def safe_load(stream): """ Parse the first YAML document in a stream and produce the corresponding Python object. - When used on untrusted input, can result in arbitrary code execution. """ - return load(stream, DangerLoader) + return load(stream, Loader=SafeLoader) -def danger_load_all(stream): +def safe_load_all(stream): """ Parse all YAML documents in a stream and produce corresponding Python objects. - When used on untrusted input, can result in arbitrary code execution. """ - return load_all(stream, DangerLoader) + return load_all(stream, Loader=SafeLoader) + +# Note: Using an alternate Loader (like PythonLoader) may be dangerous. +def python_load(stream): + """ + Parse the first YAML document in a stream + and produce the corresponding Python object. + + Warning: When used on untrusted input, can result in arbitrary code + execution. + """ + return load(stream, Loader=PythonLoader) + +def python_load_all(stream): + """ + Parse all YAML documents in a stream + and produce corresponding Python objects. + + Warning: When used on untrusted input, can result in arbitrary code + execution. + """ + return load_all(stream, Loader=PythonLoader) def emit(events, stream=None, Dumper=Dumper, canonical=None, indent=None, width=None, @@ -168,7 +180,8 @@ def serialize(node, stream=None, Dumper=Dumper, **kwds): """ return serialize_all([node], stream, Dumper=Dumper, **kwds) -def dump_all(documents, stream=None, Dumper=Dumper, +# All the top level dump functions call this: +def _dump_all(documents, stream=None, Dumper=None, default_style=None, default_flow_style=None, canonical=None, indent=None, width=None, allow_unicode=None, line_break=None, @@ -201,31 +214,49 @@ def dump_all(documents, stream=None, Dumper=Dumper, dumper.dispose() if getvalue: return getvalue() -safe_dump_all = dump_all -def danger_dump_all(documents, stream=None, **kwds): +def dump(data, stream=None, Dumper=PythonDumper, **kwds): + """ + Serialize a Python object into a YAML stream. + Produce only basic YAML tags. + """ + return _dump_all([data], stream, Dumper=Dumper, **kwds) + +def dump_all(documents, stream=None, Dumper=PythonDumper, **kwds): """ Serialize a sequence of Python objects into a YAML stream. Produce only basic YAML tags. - If stream is None, return the produced string instead. """ - return dump_all(documents, stream, Dumper=DangerDumper, **kwds) + return _dump_all(documents, stream, Dumper=Dumper, **kwds) -def dump(data, stream=None, Dumper=Dumper, **kwds): +# The safe_dump* functions can be used to create YAML that should always be +# loadable by the safe_load* functions. There should be nothing "unsafe" about +# dumping any object. +def safe_dump(data, stream=None, **kwds): """ Serialize a Python object into a YAML stream. - If stream is None, return the produced string instead. + Produce only basic YAML tags. """ - return dump_all([data], stream, Dumper=Dumper, **kwds) -safe_dump = dump + return _dump_all([data], stream, Dumper=SafeDumper, **kwds) -def danger_dump(data, stream=None, **kwds): +def safe_dump_all(documents, stream=None, **kwds): """ - Serialize a Python object into a YAML stream. + Serialize a sequence of Python objects into a YAML stream. Produce only basic YAML tags. - If stream is None, return the produced string instead. """ - return dump_all([data], stream, Dumper=DangerDumper, **kwds) + return _dump_all(documents, stream, Dumper=SafeDumper, **kwds) + +def python_dump(data, stream=None, **kwds): + """ + Serialize a Python object into a YAML stream. + """ + return _dump_all([data], stream, Dumper=PythonDumper, **kwds) + +def python_dump_all(documents, stream=None, **kwds): + """ + Serialize a sequence of Python objects into a YAML stream. + """ + return _dump_all(documents, stream, Dumper=PythonDumper, **kwds) def add_implicit_resolver(tag, regexp, first=None, Loader=Loader, Dumper=Dumper): diff --git a/lib/yaml/cyaml.py b/lib/yaml/cyaml.py index 5371f63..f3af879 100644 --- a/lib/yaml/cyaml.py +++ b/lib/yaml/cyaml.py @@ -1,6 +1,6 @@ -__all__ = ['CBaseLoader', 'CSafeLoader', 'CLoader', 'CDangerLoader', - 'CBaseDumper', 'CSafeDumper', 'CDumper', 'CDangerDumper'] +__all__ = ['CBaseLoader', 'CSafeLoader', 'CPythonLoader', 'CLoader', + 'CBaseDumper', 'CSafeDumper', 'CPythonDumper', 'CDumper'] from _yaml import CParser, CEmitter @@ -18,21 +18,24 @@ class CBaseLoader(CParser, BaseConstructor, BaseResolver): BaseConstructor.__init__(self) BaseResolver.__init__(self) -class CLoader(CParser, SafeConstructor, Resolver): +class CSafeLoader(CParser, SafeConstructor, Resolver): def __init__(self, stream): CParser.__init__(self, stream) SafeConstructor.__init__(self) Resolver.__init__(self) -CSafeLoader = CLoader -class CDangerLoader(CParser, Constructor, Resolver): +class CPythonLoader(CParser, Constructor, Resolver): def __init__(self, stream): CParser.__init__(self, stream) Constructor.__init__(self) Resolver.__init__(self) +CLoader = CSafeLoader + + + class CBaseDumper(CEmitter, BaseRepresenter, BaseResolver): def __init__(self, stream, @@ -50,7 +53,7 @@ class CBaseDumper(CEmitter, BaseRepresenter, BaseResolver): default_flow_style=default_flow_style) Resolver.__init__(self) -class CDumper(CEmitter, SafeRepresenter, Resolver): +class CSafeDumper(CEmitter, SafeRepresenter, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -66,9 +69,8 @@ class CDumper(CEmitter, SafeRepresenter, Resolver): SafeRepresenter.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) -CSafeDumper = CDumper -class CDangerDumper(CEmitter, Serializer, Representer, Resolver): +class CPythonDumper(CEmitter, Serializer, Representer, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -84,3 +86,5 @@ class CDangerDumper(CEmitter, Serializer, Representer, Resolver): Representer.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) + +CDumper = CPythonDumper diff --git a/lib/yaml/dumper.py b/lib/yaml/dumper.py index 22fd927..88477ab 100644 --- a/lib/yaml/dumper.py +++ b/lib/yaml/dumper.py @@ -1,5 +1,5 @@ -__all__ = ['BaseDumper', 'SafeDumper', 'Dumper', 'DangerDumper'] +__all__ = ['BaseDumper', 'SafeDumper', 'PythonDumper', 'Dumper'] from emitter import * from serializer import * @@ -24,7 +24,7 @@ class BaseDumper(Emitter, Serializer, BaseRepresenter, BaseResolver): default_flow_style=default_flow_style) Resolver.__init__(self) -class Dumper(Emitter, Serializer, SafeRepresenter, Resolver): +class SafeDumper(Emitter, Serializer, SafeRepresenter, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -41,9 +41,8 @@ class Dumper(Emitter, Serializer, SafeRepresenter, Resolver): SafeRepresenter.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) -SafeDumper = Dumper -class DangerDumper(Emitter, Serializer, Representer, Resolver): +class PythonDumper(Emitter, Serializer, Representer, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -60,3 +59,6 @@ class DangerDumper(Emitter, Serializer, Representer, Resolver): Representer.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) + +# The default Dumper is PythonDumper +Dumper = PythonDumper diff --git a/lib/yaml/loader.py b/lib/yaml/loader.py index 6b18527..77e119c 100644 --- a/lib/yaml/loader.py +++ b/lib/yaml/loader.py @@ -1,5 +1,5 @@ -__all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'DangerLoader'] +__all__ = ['BaseLoader', 'SafeLoader', 'PythonLoader', 'Loader'] from reader import * from scanner import * @@ -18,7 +18,7 @@ class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolve BaseConstructor.__init__(self) BaseResolver.__init__(self) -class Loader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): +class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): def __init__(self, stream): Reader.__init__(self, stream) @@ -27,9 +27,8 @@ class Loader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): Composer.__init__(self) SafeConstructor.__init__(self) Resolver.__init__(self) -SafeLoader = Loader -class DangerLoader(Reader, Scanner, Parser, Composer, Constructor, Resolver): +class PythonLoader(Reader, Scanner, Parser, Composer, Constructor, Resolver): def __init__(self, stream): Reader.__init__(self, stream) @@ -38,3 +37,6 @@ class DangerLoader(Reader, Scanner, Parser, Composer, Constructor, Resolver): Composer.__init__(self) Constructor.__init__(self) Resolver.__init__(self) + +# The default Loader is SafeLoader +Loader = SafeLoader diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py index cbb8417..994c599 100644 --- a/lib3/yaml/__init__.py +++ b/lib3/yaml/__init__.py @@ -62,28 +62,22 @@ def compose_all(stream, Loader=Loader): finally: loader.dispose() -def load(stream, Loader=Loader): +# Generic load() and load_all() default to PythonLoader. +def load(stream, Loader=PythonLoader): """ Parse the first YAML document in a stream and produce the corresponding Python object. - - By default resolve only basic YAML tags, if an alternate Loader is - provided, may be dangerous. """ loader = Loader(stream) try: return loader.get_single_data() finally: loader.dispose() -safe_load = load -def load_all(stream, Loader=Loader): +def load_all(stream, Loader=PythonLoader): """ Parse all YAML documents in a stream and produce corresponding Python objects. - - By default resolve only basic YAML tags, if an alternate Loader is - provided, may be dangerous. """ loader = Loader(stream) try: @@ -91,23 +85,41 @@ def load_all(stream, Loader=Loader): yield loader.get_data() finally: loader.dispose() -safe_load_all = load_all -def danger_load(stream): +def safe_load(stream): """ Parse the first YAML document in a stream and produce the corresponding Python object. - When used on untrusted input, can result in arbitrary code execution. """ - return load(stream, DangerLoader) + return load(stream, Loader=SafeLoader) -def danger_load_all(stream): +def safe_load_all(stream): """ Parse all YAML documents in a stream and produce corresponding Python objects. - When used on untrusted input, can result in arbitrary code execution. """ - return load_all(stream, DangerLoader) + return load_all(stream, Loader=SafeLoader) + +# Note: Using an alternate Loader (like PythonLoader) may be dangerous. +def python_load(stream): + """ + Parse the first YAML document in a stream + and produce the corresponding Python object. + + Warning: When used on untrusted input, can result in arbitrary code + execution. + """ + return load(stream, Loader=PythonLoader) + +def python_load_all(stream): + """ + Parse all YAML documents in a stream + and produce corresponding Python objects. + + Warning: When used on untrusted input, can result in arbitrary code + execution. + """ + return load_all(stream, Loader=PythonLoader) def emit(events, stream=None, Dumper=Dumper, canonical=None, indent=None, width=None, @@ -167,7 +179,8 @@ def serialize(node, stream=None, Dumper=Dumper, **kwds): """ return serialize_all([node], stream, Dumper=Dumper, **kwds) -def dump_all(documents, stream=None, Dumper=Dumper, +# All the top level dump functions call this: +def _dump_all(documents, stream=None, Dumper=None, default_style=None, default_flow_style=None, canonical=None, indent=None, width=None, allow_unicode=None, line_break=None, @@ -199,31 +212,49 @@ def dump_all(documents, stream=None, Dumper=Dumper, dumper.dispose() if getvalue: return getvalue() -safe_dump_all = dump_all -def danger_dump_all(documents, stream=None, **kwds): +def dump(data, stream=None, Dumper=PythonDumper, **kwds): + """ + Serialize a Python object into a YAML stream. + Produce only basic YAML tags. + """ + return _dump_all([data], stream, Dumper=Dumper, **kwds) + +def dump_all(documents, stream=None, Dumper=PythonDumper, **kwds): """ Serialize a sequence of Python objects into a YAML stream. Produce only basic YAML tags. - If stream is None, return the produced string instead. """ - return dump_all(documents, stream, Dumper=DangerDumper, **kwds) + return _dump_all(documents, stream, Dumper=Dumper, **kwds) -def dump(data, stream=None, Dumper=Dumper, **kwds): +# The safe_dump* functions can be used to create YAML that should always be +# loadable by the safe_load* functions. There should be nothing "unsafe" about +# dumping any object. +def safe_dump(data, stream=None, **kwds): """ Serialize a Python object into a YAML stream. - If stream is None, return the produced string instead. + Produce only basic YAML tags. """ - return dump_all([data], stream, Dumper=Dumper, **kwds) -safe_dump = dump + return _dump_all([data], stream, Dumper=SafeDumper, **kwds) -def danger_dump(data, stream=None, **kwds): +def safe_dump_all(documents, stream=None, **kwds): """ - Serialize a Python object into a YAML stream. + Serialize a sequence of Python objects into a YAML stream. Produce only basic YAML tags. - If stream is None, return the produced string instead. """ - return dump_all([data], stream, Dumper=DangerDumper, **kwds) + return _dump_all(documents, stream, Dumper=SafeDumper, **kwds) + +def python_dump(data, stream=None, **kwds): + """ + Serialize a Python object into a YAML stream. + """ + return _dump_all([data], stream, Dumper=PythonDumper, **kwds) + +def python_dump_all(documents, stream=None, **kwds): + """ + Serialize a sequence of Python objects into a YAML stream. + """ + return _dump_all(documents, stream, Dumper=PythonDumper, **kwds) def add_implicit_resolver(tag, regexp, first=None, Loader=Loader, Dumper=Dumper): diff --git a/lib3/yaml/cyaml.py b/lib3/yaml/cyaml.py index ac8b0b7..3ecab18 100644 --- a/lib3/yaml/cyaml.py +++ b/lib3/yaml/cyaml.py @@ -1,6 +1,6 @@ -__all__ = ['CBaseLoader', 'CSafeLoader', 'CLoader', 'CDangerLoader', - 'CBaseDumper', 'CSafeDumper', 'CDumper', 'CDangerDumper'] +__all__ = ['CBaseLoader', 'CSafeLoader', 'CPythonLoader', 'CLoader', + 'CBaseDumper', 'CSafeDumper', 'CPythonDumper', 'CDumper'] from _yaml import CParser, CEmitter @@ -18,21 +18,24 @@ class CBaseLoader(CParser, BaseConstructor, BaseResolver): BaseConstructor.__init__(self) BaseResolver.__init__(self) -class CLoader(CParser, SafeConstructor, Resolver): +class CSafeLoader(CParser, SafeConstructor, Resolver): def __init__(self, stream): CParser.__init__(self, stream) SafeConstructor.__init__(self) Resolver.__init__(self) -CSafeLoader = CLoader -class CDangerLoader(CParser, Constructor, Resolver): +class CPythonLoader(CParser, Constructor, Resolver): def __init__(self, stream): CParser.__init__(self, stream) Constructor.__init__(self) Resolver.__init__(self) +CLoader = CSafeLoader + + + class CBaseDumper(CEmitter, BaseRepresenter, BaseResolver): def __init__(self, stream, @@ -50,7 +53,7 @@ class CBaseDumper(CEmitter, BaseRepresenter, BaseResolver): default_flow_style=default_flow_style) Resolver.__init__(self) -class CDumper(CEmitter, SafeRepresenter, Resolver): +class CSafeDumper(CEmitter, SafeRepresenter, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -66,9 +69,8 @@ class CDumper(CEmitter, SafeRepresenter, Resolver): SafeRepresenter.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) -CSafeDumper = CDumper -class CDangerDumper(CEmitter, Serializer, Representer, Resolver): +class CPythonDumper(CEmitter, Serializer, Representer, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -84,3 +86,5 @@ class CDangerDumper(CEmitter, Serializer, Representer, Resolver): Representer.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) + +CDumper = CPythonDumper diff --git a/lib3/yaml/dumper.py b/lib3/yaml/dumper.py index b2d3a07..5e4929b 100644 --- a/lib3/yaml/dumper.py +++ b/lib3/yaml/dumper.py @@ -1,5 +1,5 @@ -__all__ = ['BaseDumper', 'SafeDumper', 'Dumper', 'DangerDumper'] +__all__ = ['BaseDumper', 'SafeDumper', 'PythonDumper', 'Dumper'] from .emitter import * from .serializer import * @@ -24,7 +24,7 @@ class BaseDumper(Emitter, Serializer, BaseRepresenter, BaseResolver): default_flow_style=default_flow_style) Resolver.__init__(self) -class Dumper(Emitter, Serializer, SafeRepresenter, Resolver): +class SafeDumper(Emitter, Serializer, SafeRepresenter, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -41,9 +41,8 @@ class Dumper(Emitter, Serializer, SafeRepresenter, Resolver): SafeRepresenter.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) -SafeDumper = Dumper -class DangerDumper(Emitter, Serializer, Representer, Resolver): +class PythonDumper(Emitter, Serializer, Representer, Resolver): def __init__(self, stream, default_style=None, default_flow_style=None, @@ -60,3 +59,6 @@ class DangerDumper(Emitter, Serializer, Representer, Resolver): Representer.__init__(self, default_style=default_style, default_flow_style=default_flow_style) Resolver.__init__(self) + +# The default Dumper is PythonDumper +Dumper = PythonDumper diff --git a/lib3/yaml/loader.py b/lib3/yaml/loader.py index 16e9fab..7f80be8 100644 --- a/lib3/yaml/loader.py +++ b/lib3/yaml/loader.py @@ -1,5 +1,5 @@ -__all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'DangerLoader'] +__all__ = ['BaseLoader', 'SafeLoader', 'PythonLoader', 'Loader'] from .reader import * from .scanner import * @@ -18,7 +18,7 @@ class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolve BaseConstructor.__init__(self) BaseResolver.__init__(self) -class Loader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): +class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): def __init__(self, stream): Reader.__init__(self, stream) @@ -27,9 +27,8 @@ class Loader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): Composer.__init__(self) SafeConstructor.__init__(self) Resolver.__init__(self) -SafeLoader = Loader -class DangerLoader(Reader, Scanner, Parser, Composer, Constructor, Resolver): +class PythonLoader(Reader, Scanner, Parser, Composer, Constructor, Resolver): def __init__(self, stream): Reader.__init__(self, stream) @@ -38,3 +37,6 @@ class DangerLoader(Reader, Scanner, Parser, Composer, Constructor, Resolver): Composer.__init__(self) Constructor.__init__(self) Resolver.__init__(self) + +# The default Loader is SafeLoader +Loader = SafeLoader diff --git a/tests/lib/test_constructor.py b/tests/lib/test_constructor.py index 12d5391..6a03f7a 100644 --- a/tests/lib/test_constructor.py +++ b/tests/lib/test_constructor.py @@ -19,9 +19,9 @@ def _make_objects(): NewArgs, NewArgsWithState, Reduce, ReduceWithState, MyInt, MyList, MyDict, \ FixedOffset, today, execute - class MyLoader(yaml.DangerLoader): + class MyLoader(yaml.PythonLoader): pass - class MyDumper(yaml.DangerDumper): + class MyDumper(yaml.PythonDumper): pass class MyTestClass1: diff --git a/tests/lib/test_recursive.py b/tests/lib/test_recursive.py index c67c170..d368b35 100644 --- a/tests/lib/test_recursive.py +++ b/tests/lib/test_recursive.py @@ -29,9 +29,9 @@ def test_recursive(recursive_filename, verbose=False): value2 = None output2 = None try: - output1 = yaml.danger_dump(value1) - value2 = yaml.danger_load(output1) - output2 = yaml.danger_dump(value2) + output1 = yaml.python_dump(value1) + value2 = yaml.python_load(output1) + output2 = yaml.python_dump(value2) assert output1 == output2, (output1, output2) finally: if verbose: diff --git a/tests/lib3/test_constructor.py b/tests/lib3/test_constructor.py index 71caa8e..c121bd7 100644 --- a/tests/lib3/test_constructor.py +++ b/tests/lib3/test_constructor.py @@ -16,9 +16,9 @@ def _make_objects(): NewArgs, NewArgsWithState, Reduce, ReduceWithState, MyInt, MyList, MyDict, \ FixedOffset, today, execute - class MyLoader(yaml.DangerLoader): + class MyLoader(yaml.PythonLoader): pass - class MyDumper(yaml.DangerDumper): + class MyDumper(yaml.PythonDumper): pass class MyTestClass1: diff --git a/tests/lib3/test_recursive.py b/tests/lib3/test_recursive.py index 31f2344..437b986 100644 --- a/tests/lib3/test_recursive.py +++ b/tests/lib3/test_recursive.py @@ -30,9 +30,9 @@ def test_recursive(recursive_filename, verbose=False): value2 = None output2 = None try: - output1 = yaml.danger_dump(value1) - value2 = yaml.danger_load(output1) - output2 = yaml.danger_dump(value2) + output1 = yaml.python_dump(value1) + value2 = yaml.python_load(output1) + output2 = yaml.python_dump(value2) assert output1 == output2, (output1, output2) finally: if verbose: |