gideonstar/blogthon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import (ConfigParser|configparser) as configparser

Browse Source
This commit is contained in:
Stefan Ritter 2011-03-24 13:05:22 +01:00
parent 718bb41ff5
commit 7b67581d11
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
blogthon.cgi
View File

@ -21,9 +21,9 @@ import re
# Backward compatibilty to python2 # Backward compatibilty to python2
try: try:
import configparser import configparser as configparser
except: except ImportError:
import ConfigParser import ConfigParser as configparser
from cgi import FieldStorage from cgi import FieldStorage
from smtplib import SMTP from smtplib import SMTP
@ -77,10 +77,7 @@ def document_header(string):
print("<rss version=\"2.0\">") print("<rss version=\"2.0\">")
# Parse configuration (with backward compatibilty) # Parse configuration (with backward compatibilty)
try:
configuration = configparser.SafeConfigParser() configuration = configparser.SafeConfigParser()
except:
configuration = ConfigParser.SafeConfigParser()
for config in ["../blogthonrc", "../.blogthonrc", "configuration"]: for config in ["../blogthonrc", "../.blogthonrc", "configuration"]:
if os.path.exists(config): if os.path.exists(config):
@ -117,9 +114,6 @@ try:
feed_preview = configuration.get("feed", "feed_preview") feed_preview = configuration.get("feed", "feed_preview")
except configparser.Error as error: except configparser.Error as error:
errorpage(str(error)) errorpage(str(error))
# And for backward compatibility
except ConfigParser.Error as error:
errorpage(str(error))
if not re.match("^http:\/\/.*$", blog_url): if not re.match("^http:\/\/.*$", blog_url):
blog_url = "http://" + blog_url blog_url = "http://" + blog_url