--- pyanaconda/errors.py | 29 ++++++++++++++--------------- pyanaconda/ui/common.py | 5 +++-- 2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/pyanaconda/errors.py b/pyanaconda/errors.py index 4b80980..8d896ad 100644 --- a/pyanaconda/errors.py +++ b/pyanaconda/errors.py @@ -42,21 +42,20 @@ class MediaUnmountError(Exception): class ScriptError(Exception): pass
-"""These constants are returned by the callback in the ErrorHandler class. - Each represents a different kind of action the caller can take: - - ERROR_RAISE - This is a fatal error, and anaconda can do nothing but quit - or raise an exception. This then feeds into the exception - handling framework. - - ERROR_CONTINUE - anaconda should continue with whatever it was going to do. - This result comes from non-fatal errors, asking yes/no - questions, and the like. - - ERROR_RETRY - This is a serious problem, but anaconda should attempt to - try again. Continued failures may eventually result in an - ERROR_RAISE. -""" +# These constants are returned by the callback in the ErrorHandler class. +# Each represents a different kind of action the caller can take: +# +# ERROR_RAISE - This is a fatal error, and anaconda can do nothing but quit +# or raise an exception. This then feeds into the exception +# handling framework. +# +# ERROR_CONTINUE - anaconda should continue with whatever it was going to do. +# This result comes from non-fatal errors, asking yes/no +# questions, and the like. +# +# ERROR_RETRY - This is a serious problem, but anaconda should attempt to +# try again. Continued failures may eventually result in an +# ERROR_RAISE. ERROR_RAISE = 0 ERROR_CONTINUE = 1 ERROR_RETRY = 2 diff --git a/pyanaconda/ui/common.py b/pyanaconda/ui/common.py index 38b18c6..19640ae 100644 --- a/pyanaconda/ui/common.py +++ b/pyanaconda/ui/common.py @@ -334,8 +334,6 @@ class Spoke(UIObject): raise NotImplementedError
class NormalSpoke(Spoke): - priority = 100 - """A NormalSpoke is a Spoke subclass that is displayed when the user selects something on a Hub. This is what most Spokes in anaconda will be based on. @@ -345,6 +343,9 @@ class NormalSpoke(Spoke): provides some basic navigation information (where you are, what you're installing, how to get back to the Hub) at the top of the screen. """ + + priority = 100 + def __init__(self, data, storage, payload, instclass): """Create a NormalSpoke instance.""" if self.__class__ is NormalSpoke: