use configparser backport to support python2.6 again

pull/16/head
Martin Zimmermann 11 years ago
parent 988d2032c5
commit f9133b984e

@ -5,6 +5,7 @@ from __future__ import print_function
import io import io
import os import os
import time import time
import binascii
import thread import thread
import threading import threading
@ -15,7 +16,7 @@ import smtplib
import httplib import httplib
import urlparse import urlparse
from ConfigParser import ConfigParser from configparser import ConfigParser
try: try:
import uwsgi import uwsgi
@ -29,7 +30,7 @@ class Config:
default = [ default = [
"[general]", "[general]",
"dbpath = /tmp/isso.db", "secretkey = %r" % os.urandom(24), "dbpath = /tmp/isso.db", "secretkey = %r" % binascii.b2a_hex(os.urandom(24)),
"host = http://localhost:8080/", "passphrase = p@$$w0rd", "host = http://localhost:8080/", "passphrase = p@$$w0rd",
"max-age = 900", "max-age = 900",
"[server]", "[server]",
@ -48,7 +49,7 @@ class Config:
def load(cls, configfile): def load(cls, configfile):
rv = ConfigParser(allow_no_value=True) rv = ConfigParser(allow_no_value=True)
rv.readfp(io.StringIO(u'\n'.join(Config.default))) rv.read_file(io.StringIO(u'\n'.join(Config.default)))
if configfile: if configfile:
rv.read(configfile) rv.read(configfile)

@ -15,8 +15,8 @@ from werkzeug.exceptions import abort, BadRequest
from isso import utils, notify, db from isso import utils, notify, db
from isso.crypto import pbkdf2 from isso.crypto import pbkdf2
FIELDS = {'id', 'parent', 'text', 'author', 'website', 'email', 'mode', 'created', FIELDS = set(['id', 'parent', 'text', 'author', 'website', 'email', 'mode',
'modified', 'likes', 'dislikes', 'hash'} 'created', 'modified', 'likes', 'dislikes', 'hash'])
class requires: class requires:

@ -8,7 +8,7 @@ from setuptools import setup, find_packages
requires = ['Jinja2>=2.7', 'werkzeug>=0.9', 'itsdangerous', 'misaka', 'html5lib'] requires = ['Jinja2>=2.7', 'werkzeug>=0.9', 'itsdangerous', 'misaka', 'html5lib']
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
requires += ['ipaddress'] requires += ['ipaddress', 'configparser']
setup( setup(
name='isso', name='isso',

@ -5,6 +5,11 @@ indexserver =
[testenv:py26] [testenv:py26]
deps = deps =
argparse argparse
configparser
{[testenv]deps}
[testenv:py27]
deps =
configparser
{[testenv]deps} {[testenv]deps}
[testenv] [testenv]
deps = deps =

Loading…
Cancel
Save