You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@steve.apache.org by hu...@apache.org on 2016/02/10 18:06:00 UTC
svn commit: r1729658 - in /steve/trunk/pysteve/lib: election.py form.py
response.py voter.py
Author: humbedooh
Date: Wed Feb 10 17:06:00 2016
New Revision: 1729658
URL: http://svn.apache.org/viewvc?rev=1729658&view=rev
Log:
cleanups + hacks to enable wsgi
Modified:
steve/trunk/pysteve/lib/election.py
steve/trunk/pysteve/lib/form.py
steve/trunk/pysteve/lib/response.py
steve/trunk/pysteve/lib/voter.py
Modified: steve/trunk/pysteve/lib/election.py
URL: http://svn.apache.org/viewvc/steve/trunk/pysteve/lib/election.py?rev=1729658&r1=1729657&r2=1729658&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/election.py (original)
+++ steve/trunk/pysteve/lib/election.py Wed Feb 10 17:06:00 2016
@@ -21,8 +21,12 @@ import random
import time
from itertools import izip
-
-from __main__ import homedir, config
+try:
+ from __main__ import config
+except:
+ import ConfigParser as configparser
+ config = configparser.RawConfigParser()
+ config.read("%s/../../../steve.cfg" % (os.path.dirname(__file__)))
import constants, voter
from plugins import *
Modified: steve/trunk/pysteve/lib/form.py
URL: http://svn.apache.org/viewvc/steve/trunk/pysteve/lib/form.py?rev=1729658&r1=1729657&r2=1729658&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/form.py (original)
+++ steve/trunk/pysteve/lib/form.py Wed Feb 10 17:06:00 2016
@@ -15,7 +15,6 @@
# limitations under the License.
#
import hashlib, json, random, os, sys, time
-from __main__ import homedir, config
import cgi
Modified: steve/trunk/pysteve/lib/response.py
URL: http://svn.apache.org/viewvc/steve/trunk/pysteve/lib/response.py?rev=1729658&r1=1729657&r2=1729658&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/response.py (original)
+++ steve/trunk/pysteve/lib/response.py Wed Feb 10 17:06:00 2016
@@ -35,5 +35,10 @@ def respond(code, js):
print("Status: %u %s\r\nContent-Type: application/json\r\nCache-Control: no-cache\r\nContent-Length: %u\r\n" % (code, c, len(out)))
print(out)
-
-
\ No newline at end of file
+def wsgirespond(start_response, code, js):
+ c = responseCodes[code] if code in responseCodes else "Unknown Response Code(?)"
+ out = json.dumps(js, indent=4)
+ start_response("%u %s" % (code, c), [
+ ("Content-Type", "application/json"), ("Cache-Control", "no-cache"), ("Content-Length", "%u" % len(out))
+ ])
+ return out
\ No newline at end of file
Modified: steve/trunk/pysteve/lib/voter.py
URL: http://svn.apache.org/viewvc/steve/trunk/pysteve/lib/voter.py?rev=1729658&r1=1729657&r2=1729658&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/voter.py (original)
+++ steve/trunk/pysteve/lib/voter.py Wed Feb 10 17:06:00 2016
@@ -15,7 +15,12 @@
# limitations under the License.
#
import hashlib, json, random, os, sys, time
-from __main__ import homedir, config
+try:
+ from __main__ import config
+except:
+ import ConfigParser as configparser
+ config = configparser.RawConfigParser()
+ config.read("%s/../../../steve.cfg" % (os.path.dirname(__file__)))
# SMTP Lib
import smtplib