diff options
author | cfdv <caldavis@gmail.com> | 2011-06-19 17:39:32 -0500 |
---|---|---|
committer | cfdv <caldavis@gmail.com> | 2011-06-19 17:39:32 -0500 |
commit | 0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada (patch) | |
tree | 7a0936a9a83f9f39a090f96e41a274ac77ddaee4 /mediagoblin/util.py | |
parent | e8fda91bc2326911ea9a0197e595bc333540c282 (diff) | |
parent | 188240e312b8c5ff50bef276c97b36e5b3835f1e (diff) | |
download | mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.lz mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.xz mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.zip |
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
Diffstat (limited to 'mediagoblin/util.py')
-rw-r--r-- | mediagoblin/util.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/mediagoblin/util.py b/mediagoblin/util.py index fc380f41..349bc027 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -18,7 +18,6 @@ from email.MIMEText import MIMEText import gettext import pkg_resources import smtplib -import os import sys import re import urllib @@ -28,7 +27,6 @@ import copy from babel.localedata import exists import jinja2 import translitcodec -from paste.deploy.loadwsgi import NicerConfigParser from webob import Response, exc from lxml.html.clean import Cleaner @@ -352,28 +350,6 @@ def get_locale_from_request(request): return locale_to_lower_upper(target_lang) -def read_config_file(conf_file): - """ - Read a paste deploy style config file and process it. - """ - if not os.path.exists(conf_file): - raise IOError( - "MEDIAGOBLIN_CONFIG not set or file does not exist") - - parser = NicerConfigParser(conf_file) - parser.read(conf_file) - parser._defaults.setdefault( - 'here', os.path.dirname(os.path.abspath(conf_file))) - parser._defaults.setdefault( - '__file__', os.path.abspath(conf_file)) - - mgoblin_conf = dict( - [(section_name, dict(parser.items(section_name))) - for section_name in parser.sections()]) - - return mgoblin_conf - - # A super strict version of the lxml.html cleaner class HTML_CLEANER = Cleaner( scripts=True, |