status-report-scripts review-stats.py,1.6,1.7

[Jason ティビツ]

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8705

Modified Files:
	review-stats.py 
Log Message:
Hoist out all of the duplicated row entry generation code.



Index: review-stats.py
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-stats.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- review-stats.py	24 Nov 2009 22:10:41 -0000	1.6
+++ review-stats.py	17 Dec 2009 22:30:29 -0000	1.7
@@ -1,5 +1,5 @@
 #!/usr/bin/python -t
-VERSION = "2.1"
+VERSION = "2.2"
 
 # $Id$
 # Note: This script presently lives in internal git and external cvs.  External
@@ -207,6 +207,17 @@
     return 0
 
 
+# The data from a standard row in a bug list
+def std_row(bug, rowclass):
+    return {'id': bug.bug_id,
+            'alias': to_unicode(bug.alias),
+            'assignee': nobody(to_unicode(bug.assigned_to)),
+            'class': rowclass,
+            'lastchange': bug.changeddate,
+            'status': bug.bug_status,
+            'summary': to_unicode(bug.short_desc),
+            }
+
 # Report generators
 def report_hidden(bugs, bugdata, loader, tmpdir, subs):
     data = deepcopy(subs)
@@ -222,14 +233,7 @@
             elif data['count'] % 2 == 1:
                 rowclass = 'bz_row_odd'
 
-            data['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
 
     write_html(loader, 'plain.html', data, tmpdir, 'HIDDEN.html')
@@ -250,14 +254,7 @@
             if data['count'] % 2 == 1:
                 rowclass = 'bz_row_odd'
 
-            data['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
 
     write_html(loader, 'plain.html', data, tmpdir, 'MERGE.html')
@@ -282,14 +279,7 @@
                 curmonth = yrmonth(i.opendate)
                 curcount = 0
 
-            data['months'][-1]['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['months'][-1]['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
             curcount +=1
 
@@ -320,14 +310,7 @@
                 curmonth = yrmonth(i.opendate)
                 curcount = 0
 
-            data['months'][-1]['bugs'].append({'id': i.bug_id,
-                    'alias': to_unicode(i.alias),
-                    'assignee': nobody(to_unicode(i.assigned_to)),
-                    'class': rowclass,
-                    'lastchange': i.changeddate,
-                    'status': i.bug_status,
-                    'summary': to_unicode(i.short_desc),
-                    })
+            data['months'][-1]['bugs'].append(std_row(i, rowclass))
             data['count'] +=1
             curcount +=1