mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 09:56:13 +01:00
Code

- Request: format_review, format_action should be static methods

Browse Source 
- adjusted method docstring
- server_diff_noex: removed print statement
This commit is contained in:
Marcus Huewe 2011-01-30 21:23:40 +01:00
parent 2d29062e14
commit 88376a2bed
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osc/core.py
View File

@ -2465,10 +2465,11 @@ class Request:
xmlindent(root) xmlindent(root)
return ET.tostring(root) return ET.tostring(root)
def _format_review(self, review, show_srcupdate=False): @staticmethod
def format_review(review, show_srcupdate=False):
""" """
format a review depending on the reviewer's type. format a review depending on the reviewer's type.
A formatted str is returned. A dict which contains the formatted str's is returned.
""" """
d = {'state': '%s:' % review.state} d = {'state': '%s:' % review.state}
@ -2488,10 +2489,11 @@ class Request:
d['by'] += '(%s)' % review.who d['by'] += '(%s)' % review.who
return d return d
def _format_action(self, action, show_srcupdate=False): @staticmethod
def format_action(action, show_srcupdate=False):
""" """
format an action depending on the action's type. format an action depending on the action's type.
A formatted str is returned. A dict which contains the formatted str's is returned.
""" """
def prj_pkg_join(prj, pkg): def prj_pkg_join(prj, pkg):
if not pkg: if not pkg:
@ -2533,10 +2535,10 @@ class Request:
lines = ['%6s State:%-10s By:%-12s When:%-19s' % (self.reqid, self.state.name, self.state.who, self.state.when)] lines = ['%6s State:%-10s By:%-12s When:%-19s' % (self.reqid, self.state.name, self.state.who, self.state.when)]
tmpl = ' %(type)-16s %(source)-50s %(target)s' tmpl = ' %(type)-16s %(source)-50s %(target)s'
for action in self.actions: for action in self.actions:
lines.append(tmpl % self._format_action(action)) lines.append(tmpl % Request.format_action(action))
tmpl = ' Review by %(type)-10s is %(state)-10s %(by)-50s' tmpl = ' Review by %(type)-10s is %(state)-10s %(by)-50s'
for review in self.reviews: for review in self.reviews:
lines.append(tmpl % self._format_review(review)) lines.append(tmpl % Request.format_review(review))
history = ['%s(%s)' % (hist.name, hist.who) for hist in self.statehistory] history = ['%s(%s)' % (hist.name, hist.who) for hist in self.statehistory]
if history: if history:
lines.append(' From: %s' % ' -> '.join(history)) lines.append(' From: %s' % ' -> '.join(history))
@ -2555,7 +2557,7 @@ class Request:
if action.type == 'delete': if action.type == 'delete':
# remove 1 whitespace because source is empty # remove 1 whitespace because source is empty
tmpl = ' %(type)-12s %(source)s %(target)s' tmpl = ' %(type)-12s %(source)s %(target)s'
lines.append(tmpl % self._format_action(action, show_srcupdate=True)) lines.append(tmpl % Request.format_action(action, show_srcupdate=True))
lines.append('\n\nMessage:') lines.append('\n\nMessage:')
if self.description: if self.description:
lines.append(self.description.encode(locale.getpreferredencoding(), 'replace')) lines.append(self.description.encode(locale.getpreferredencoding(), 'replace'))
@ -3960,7 +3962,6 @@ def server_diff_noex(apiurl,
if expand: if expand:
rdiff = "## diff on expanded link not possible, showing unexpanded version\n" rdiff = "## diff on expanded link not possible, showing unexpanded version\n"
print rdiff
rdiff += server_diff_noex(apiurl, rdiff += server_diff_noex(apiurl,
old_project, old_package, old_revision, old_project, old_package, old_revision,
new_project, new_package, new_revision, new_project, new_package, new_revision,
@ -6023,7 +6024,7 @@ def edit_submitrequest(apiurl, project, orequest, new_request=None):
if len(actions) > 1: if len(actions) > 1:
print 'Please chose one of the following submit actions:' print 'Please chose one of the following submit actions:'
for i in range(len(actions)): for i in range(len(actions)):
fmt = orequest._format_action(actions[i]) fmt = Request.format_action(actions[i])
print '(%i)' % i, '%(source)s %(target)s' % fmt print '(%i)' % i, '%(source)s %(target)s' % fmt
num = raw_input('> ') num = raw_input('> ')
try: try: