mirror of
https://github.com/ansible/awx.git
synced 2026-05-18 06:47:41 -02:30
Merge pull request #8147 from ryanpetrello/py-path
move an optional import for awxkit Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
@@ -2,7 +2,6 @@ import os
|
|||||||
import yaml
|
import yaml
|
||||||
import glob
|
import glob
|
||||||
import logging
|
import logging
|
||||||
from py.path import local
|
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@@ -82,6 +81,7 @@ def load_file(filename):
|
|||||||
- "{random_uuid}"
|
- "{random_uuid}"
|
||||||
random_thing: "{random_string:24}"
|
random_thing: "{random_string:24}"
|
||||||
"""
|
"""
|
||||||
|
from py.path import local
|
||||||
if filename is None:
|
if filename is None:
|
||||||
this_file = os.path.abspath(__file__)
|
this_file = os.path.abspath(__file__)
|
||||||
path = local(this_file).new(basename='../data.yaml')
|
path = local(this_file).new(basename='../data.yaml')
|
||||||
|
|||||||
Reference in New Issue
Block a user