Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

permit only one argument to user.warn and user.notify_error

Browse Source 
since second arguments are optional in both ErrorDialog and
WarningDialog (so some errors and warnings have only one)


svn: r19674
This commit is contained in:
Paul Franklin
2012-05-27 14:44:37 +00:00
parent aa15862b81
commit 7c7bdaac9b
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cli/user.py
View File

@@ -67,9 +67,9 @@ class User(gen.user.User):
@type title: str
@param message: the message associated with the progress meter
@type message: str
@param steps: the total number of steps for the progress meter. a value
of 0 indicates that the ending is unknown and the meter should just
show activity.
@param steps: the total number of steps for the progress meter.
a value of 0 indicates that the ending is unknown and the
meter should just show activity.
@type steps: int
@returns: none
"""
@@ -101,8 +101,8 @@ class User(gen.user.User):
def prompt(self, title, question):
"""
Ask the user a question. The answer must be "yes" or "no". The user will
be forced to answer the question before proceeding.
Ask the user a question. The answer must be "yes" or "no".
The user will be forced to answer the question before proceeding.
@param title: the title of the question
@type title: str
@@ -113,7 +113,7 @@ class User(gen.user.User):
"""
return False
def warn(self, title, warning):
def warn(self, title, warning=""):
"""
Warn the user.
@@ -125,7 +125,7 @@ class User(gen.user.User):
"""
print "%s %s" % (title, warning)
def notify_error(self, title, error):
def notify_error(self, title, error=""):
"""
Notify the user of an error.
@@ -135,4 +135,4 @@ class User(gen.user.User):
@type error: str
@returns: none
"""
print "%s %s" % (title, warning)
print "%s %s" % (title, error)

18
src/gen/user.py
View File

@@ -32,8 +32,8 @@ The User class provides basic interaction with the user.
class User():
"""
This class provides a means to interact with the user in an abstract way.
This class should be overridden by each respective user interface to provide
the appropriate interaction (eg. dialogs for GTK, promts for CLI).
This class should be overridden by each respective user interface to
provide the appropriate interaction (eg. dialogs for GTK, prompts for CLI).
"""
def begin_progress(self, title, message, steps):
"""
@@ -43,9 +43,9 @@ class User():
@type title: str
@param message: the message associated with the progress meter
@type message: str
@param steps: the total number of steps for the progress meter. a value
of 0 indicates that the ending is unknown and the meter should just
show activity.
@param steps: the total number of steps for the progress meter.
a value of 0 indicates that the ending is unknown and the
meter should just show activity.
@type steps: int
@returns: none
"""
@@ -65,8 +65,8 @@ class User():
def prompt(self, title, question):
"""
Ask the user a question. The answer must be "yes" or "no". The user will
be forced to answer the question before proceeding.
Ask the user a question. The answer must be "yes" or "no".
The user will be forced to answer the question before proceeding.
@param title: the title of the question
@type title: str
@@ -77,7 +77,7 @@ class User():
"""
return False
def warn(self, title, warning):
def warn(self, title, warning=""):
"""
Warn the user.
@@ -89,7 +89,7 @@ class User():
"""
pass
def notify_error(self, title, error):
def notify_error(self, title, error=""):
"""
Notify the user of an error.

16
src/gui/user.py
View File

@@ -54,9 +54,9 @@ class User(gen.user.User):
@type title: str
@param message: the message associated with the progress meter
@type message: str
@param steps: the total number of steps for the progress meter. a value
of 0 indicates that the ending is unknown and the meter should just
show activity.
@param steps: the total number of steps for the progress meter.
a value of 0 indicates that the ending is unknown and the
meter should just show activity.
@type steps: int
@returns: none
"""
@@ -83,8 +83,8 @@ class User(gen.user.User):
def prompt(self, title, question):
"""
Ask the user a question. The answer must be "yes" or "no". The user will
be forced to answer the question before proceeding.
Ask the user a question. The answer must be "yes" or "no".
The user will be forced to answer the question before proceeding.
@param title: the title of the question
@type title: str
@@ -95,7 +95,7 @@ class User(gen.user.User):
"""
return False
def warn(self, title, warning):
def warn(self, title, warning=""):
"""
Warn the user.
@@ -107,7 +107,7 @@ class User(gen.user.User):
"""
WarningDialog(title, warning)
def notify_error(self, title, error):
def notify_error(self, title, error=""):
"""
Notify the user of an error.
@@ -117,4 +117,4 @@ class User(gen.user.User):
@type error: str
@returns: none
"""
ErrorDialog(title, warning)
ErrorDialog(title, error)