|
|
@ -26,7 +26,6 @@ |
|
|
|
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
|
|
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
|
|
# POSSIBILITY OF SUCH DAMAGE. |
|
|
|
# POSSIBILITY OF SUCH DAMAGE. |
|
|
|
|
|
|
|
|
|
|
|
from . import config |
|
|
|
|
|
|
|
from . import ConfigBase |
|
|
|
from . import ConfigBase |
|
|
|
from . import CONFIG_FORMATS |
|
|
|
from . import CONFIG_FORMATS |
|
|
|
from .ConfigurationManager import ConfigurationManager |
|
|
|
from .ConfigurationManager import ConfigurationManager |
|
|
@ -255,7 +254,7 @@ class AppriseConfig: |
|
|
|
logger.debug("Loading raw configuration: {}".format(content)) |
|
|
|
logger.debug("Loading raw configuration: {}".format(content)) |
|
|
|
|
|
|
|
|
|
|
|
# Create ourselves a ConfigMemory Object to store our configuration |
|
|
|
# Create ourselves a ConfigMemory Object to store our configuration |
|
|
|
instance = config.ConfigMemory.ConfigMemory( |
|
|
|
instance = C_MGR['memory']( |
|
|
|
content=content, format=format, asset=asset, tag=tag, |
|
|
|
content=content, format=format, asset=asset, tag=tag, |
|
|
|
recursion=recursion, insecure_includes=insecure_includes) |
|
|
|
recursion=recursion, insecure_includes=insecure_includes) |
|
|
|
|
|
|
|
|
|
|
@ -330,7 +329,7 @@ class AppriseConfig: |
|
|
|
schema = GET_SCHEMA_RE.match(url) |
|
|
|
schema = GET_SCHEMA_RE.match(url) |
|
|
|
if schema is None: |
|
|
|
if schema is None: |
|
|
|
# Plan B is to assume we're dealing with a file |
|
|
|
# Plan B is to assume we're dealing with a file |
|
|
|
schema = config.ConfigFile.ConfigFile.protocol |
|
|
|
schema = 'file' |
|
|
|
url = '{}://{}'.format(schema, URLBase.quote(url)) |
|
|
|
url = '{}://{}'.format(schema, URLBase.quote(url)) |
|
|
|
|
|
|
|
|
|
|
|
else: |
|
|
|
else: |
|
|
|