From af3fb6c6eb233af00229a908bab92afbf38bad0b Mon Sep 17 00:00:00 2001 From: SoniEx2 Date: Sun, 19 Jul 2020 20:38:05 -0300 Subject: Move a lot of things around (broken) --- ganarchy/data.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ganarchy/data.py') diff --git a/ganarchy/data.py b/ganarchy/data.py index 7de0764..730a5a9 100644 --- a/ganarchy/data.py +++ b/ganarchy/data.py @@ -1,5 +1,5 @@ # This file is part of GAnarchy - decentralized project hub -# Copyright (C) 2019 Soni L. +# Copyright (C) 2019, 2020 Soni L. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -35,6 +35,8 @@ import requests from enum import Enum from urllib.parse import urlparse +import ganarchy.dirs + # TODO move elsewhere class URIPredicate(abdl.predicates.Predicate): def __init__(self, ports=range(1,65536), schemes=('https',)): @@ -391,8 +393,7 @@ class ConfigManager(DataSource): @classmethod def new_default(cls): - from ganarchy import config_home, config_dirs - srcs = [LocalDataSource(d + "/config.toml") for d in [config_home] + config_dirs] + srcs = [LocalDataSource(d + "/config.toml") for d in [ganarchy.dirs.CONFIG_HOME] + ganarchy.dirs.CONFIG_DIRS] return cls(srcs + [DefaultsDataSource()]) def exists(self): -- cgit 1.4.1