Author: humbedooh
Date: Tue Mar 8 12:39:48 2016
New Revision: 1734066
URL: http://svn.apache.org/viewvc?rev=1734066&view=rev
Log:
fixups
Modified:
steve/trunk/pysteve/lib/plugins/stv.py
Modified: steve/trunk/pysteve/lib/plugins/stv.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/lib/plugins/stv.py?rev=1734066&r1=1734065&r2=1734066&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/plugins/stv.py (original)
+++ steve/trunk/pysteve/lib/plugins/stv.py Tue Mar 8 12:39:48 2016
@@ -372,7 +372,10 @@ def tallySTV(votes, issue, version = 2):
try:
winners = run_vote(candidates, votes, numseats)
except:
- return tallySTV(ovotes, issue, version = 1)
+ return tallySTV(ovotes, issue, 1)
+ else:
+ winners = run_vote(candidates, votes, numseats)
+
winnernames = []
for c in winners:
@@ -383,7 +386,8 @@ def tallySTV(votes, issue, version = 2):
'votes': len(rvotes),
'winners': winners,
'winnernames': winnernames,
- 'debug': debug
+ 'debug': debug,
+ 'version': version
}, """
Winners:
- %s