diff --git a/libraries/entropy/const.py b/libraries/entropy/const.py index 3248afa59..8a02cace2 100644 --- a/libraries/entropy/const.py +++ b/libraries/entropy/const.py @@ -89,13 +89,6 @@ etpCache = { 'ugc_srv_cache': 'ugc/ugc_srv_cache' } -# kept for backward compatibility -# XXX will be removed before 10-10-2009 -etpRepositories = {} -etpRepositoriesExcluded = {} -etpRepositoriesOrder = [] - - etpConst = {} def initconfig_entropy_constants(rootdir): diff --git a/libraries/entropy/core.py b/libraries/entropy/core.py index 3e1d52b74..95d877969 100644 --- a/libraries/entropy/core.py +++ b/libraries/entropy/core.py @@ -24,9 +24,8 @@ from __future__ import with_statement import os from entropy.exceptions import IncorrectParameter, SystemDatabaseError from entropy.const import etpConst, etpUi, etpSys, const_setup_perms, \ - etpRepositories, etpRepositoriesOrder, const_secure_config_file, \ - const_set_nice_level, etpRepositories, \ - etpRepositoriesExcluded, const_extract_cli_repo_params, etpCache + const_secure_config_file, const_set_nice_level, \ + const_extract_cli_repo_params, etpCache from entropy.i18n import _ class Singleton(object): @@ -1103,12 +1102,6 @@ class SystemSettings(Singleton): 'security_advisories_url': etpConst['securityurl'], } - # kept for backward compatibility - # XXX will be removed before 10-10-2009 - etpRepositories.clear() - etpRepositoriesExcluded.clear() - del etpRepositoriesOrder[:] - repo_conf = etpConst['repositoriesconf'] if not (os.path.isfile(repo_conf) and os.access(repo_conf, os.R_OK)): return data @@ -1210,12 +1203,6 @@ class SystemSettings(Singleton): except (IndexError, ValueError, TypeError,): continue - # kept for backward compatibility - # XXX will be removed before 10-10-2009 - etpRepositories.update(data['available']) - etpRepositoriesExcluded.update(data['excluded']) - etpRepositoriesOrder.extend(data['order']) - return data def _clear_repository_cache(self, repoid = None):