From 29fdb2a95f04b7763f89fad25bc6665c756a704f Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 29 Mar 2011 12:17:21 +0200 Subject: [PATCH] [entropy.client.interfaces.qa] make UGCErrorReportInterface repository_id constructor argument mandatory --- client/equo.py | 4 +++- libraries/entropy/client/interfaces/qa.py | 9 +++------ sulfur/src/sulfur/dialogs.py | 4 +++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/equo.py b/client/equo.py index b5ebfa2ee..83b8dc20e 100644 --- a/client/equo.py +++ b/client/equo.py @@ -960,7 +960,9 @@ def handle_exception(exc_class, exc_instance, exc_tb): try: from entropy.client.interfaces.qa import UGCErrorReportInterface - error = UGCErrorReportInterface() + from entropy.core.settings.base import SystemSettings + repository_id = SystemSettings()['repositories']['default_repository'] + error = UGCErrorReportInterface(repository_id) except (OnlineMirrorError, AttributeError, ImportError,): error = None diff --git a/libraries/entropy/client/interfaces/qa.py b/libraries/entropy/client/interfaces/qa.py index dc4c3935f..bd01f39b8 100644 --- a/libraries/entropy/client/interfaces/qa.py +++ b/libraries/entropy/client/interfaces/qa.py @@ -36,20 +36,17 @@ class UGCErrorReportInterface(ErrorReportInterface): print("cannot report error") """ - def __init__(self, repository_id = None): + def __init__(self, repository_id): """ object constructor, repository_id must be a valid repository identifier. - @param repository_id -- valid repository identifier - @type basestring + @param repository_id: valid repository identifier + @type repository_id: string """ ErrorReportInterface.__init__(self, '#fake#') self.__system_settings = SystemSettings() - if repository_id == None: - repository_id = etpConst['officialrepositoryid'] - self.entropy = Client() self.__repository_id = repository_id if self.entropy.UGC == None: diff --git a/sulfur/src/sulfur/dialogs.py b/sulfur/src/sulfur/dialogs.py index 0271a167a..0c4127d33 100644 --- a/sulfur/src/sulfur/dialogs.py +++ b/sulfur/src/sulfur/dialogs.py @@ -3339,8 +3339,10 @@ class ExceptionDialog: if rc == -1: from entropy.client.interfaces.qa import UGCErrorReportInterface + from entropy.core.settings.base import SystemSettings + repository_id = SystemSettings()['repositories']['default_repository'] try: - error = UGCErrorReportInterface() + error = UGCErrorReportInterface(repository_id) except (AttributeError, OnlineMirrorError,): error = None