Merge "Defer loading PyYAML"
This commit is contained in:
commit
468d80e3ac
|
@ -13,8 +13,6 @@
|
||||||
"""Output formatters using PyYAML.
|
"""Output formatters using PyYAML.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import yaml
|
|
||||||
|
|
||||||
from . import base
|
from . import base
|
||||||
from cliff import columns
|
from cliff import columns
|
||||||
|
|
||||||
|
@ -25,6 +23,9 @@ class YAMLFormatter(base.ListFormatter, base.SingleFormatter):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def emit_list(self, column_names, data, stdout, parsed_args):
|
def emit_list(self, column_names, data, stdout, parsed_args):
|
||||||
|
# the yaml import is slow, so defer loading until we know we want it
|
||||||
|
import yaml
|
||||||
|
|
||||||
items = []
|
items = []
|
||||||
for item in data:
|
for item in data:
|
||||||
items.append(
|
items.append(
|
||||||
|
@ -36,6 +37,9 @@ class YAMLFormatter(base.ListFormatter, base.SingleFormatter):
|
||||||
yaml.safe_dump(items, stream=stdout, default_flow_style=False)
|
yaml.safe_dump(items, stream=stdout, default_flow_style=False)
|
||||||
|
|
||||||
def emit_one(self, column_names, data, stdout, parsed_args):
|
def emit_one(self, column_names, data, stdout, parsed_args):
|
||||||
|
# the yaml import is slow, so defer loading until we know we want it
|
||||||
|
import yaml
|
||||||
|
|
||||||
for key, value in zip(column_names, data):
|
for key, value in zip(column_names, data):
|
||||||
dict_data = {
|
dict_data = {
|
||||||
key: (value.machine_readable()
|
key: (value.machine_readable()
|
||||||
|
|
Loading…
Reference in New Issue