entropy.tools: move get_repository_settings to entropy.client.interfaces.methods.Methods

libraries/entropy/client/interfaces/methods.py

@@ -361,6 +361,15 @@ class Repository:
             self.reload_constants()
         self.validate_repositories()
 
+    def get_repository_settings(self, repoid):
+        try:
+            repodata = self.SystemSettings['repositories']['available'][repoid].copy()
+        except KeyError:
+            if not self.SystemSettings['repositories']['excluded'].has_key(repoid):
+                raise
+            repodata = self.SystemSettings['repositories']['excluded'][repoid].copy()
+        return repodata
+
     # every tbz2 file that would be installed must pass from here
     def add_tbz2_to_repos(self, tbz2file):
         atoms_contained = []

libraries/entropy/tools.py

@@ -2163,15 +2163,6 @@ def read_repositories_conf():
         f.close()
     return content
 
-def get_repository_settings(repoid):
-    try:
-        repodata = etpRepositories[repoid].copy()
-    except KeyError:
-        if not etpRepositoriesExcluded.has_key(repoid):
-            raise
-        repodata = etpRepositoriesExcluded[repoid].copy()
-    return repodata
-
 def write_ordered_repositories_entries(ordered_repository_list):
     content = read_repositories_conf()
     content = [x.strip() for x in content]
@@ -2795,11 +2786,6 @@ def convertSecondsToFancyOutput(*args, **kwargs):
     warnings.warn("deprecated, use convert_seconds_to_fancy_output instead")
     return convert_seconds_to_fancy_output(*args, **kwargs)
 
-def getRepositorySettings(*args, **kwargs):
-    import warnings
-    warnings.warn("deprecated, use get_repository_settings instead")
-    return get_repository_settings(*args, **kwargs)
-
 def writeOrderedRepositoriesEntries(*args, **kwargs):
     import warnings
     warnings.warn("deprecated, use write_ordered_repositories_entries instead")

spritz/src/spritz.py

@@ -1993,7 +1993,7 @@ class SpritzApplication(Controller):
         repostuff = selection.get_selected()
         if repostuff[1] != None:
             repoid = self.repoView.get_repoid(repostuff)
-            repodata = entropy.tools.get_repository_settings(repoid)
+            repodata = self.Equo.get_repository_settings(repoid)
             self.__loadRepodata(repodata)
             self.addrepo_ui.addRepoWin.show()