diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-06-26 22:13:23 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-06-26 22:13:23 +0530 |
| commit | 054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd (patch) | |
| tree | b8890b62d50cfc20a7d9af7d86d6ceb0a29eb5fd /mediagoblin/tools | |
| parent | 2719d546a57c2332e36cc056ac80ec5d79672c1a (diff) | |
| parent | 491f2007f5d1f5f595c37491b7f9c0c2b4c93963 (diff) | |
| download | mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.tar.lz mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.tar.xz mediagoblin-054ef9a76a2ca73c0ca3cb8325a01cc981a39ddd.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tools')
| -rw-r--r-- | mediagoblin/tools/mail.py | 7 | ||||
| -rw-r--r-- | mediagoblin/tools/response.py | 2 | ||||
| -rw-r--r-- | mediagoblin/tools/template.py | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/mediagoblin/tools/mail.py b/mediagoblin/tools/mail.py index 6886c859..0fabc5a9 100644 --- a/mediagoblin/tools/mail.py +++ b/mediagoblin/tools/mail.py @@ -90,7 +90,12 @@ def send_email(from_addr, to_addrs, subject, message_body): if common.TESTS_ENABLED or mg_globals.app_config['email_debug_mode']: mhost = FakeMhost() elif not mg_globals.app_config['email_debug_mode']: - mhost = smtplib.SMTP( + if mg_globals.app_config['email_smtp_use_ssl']: + smtp_init = smtplib.SMTP_SSL + else: + smtp_init = smtplib.SMTP + + mhost = smtp_init( mg_globals.app_config['email_smtp_host'], mg_globals.app_config['email_smtp_port']) diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py index aaf31d0b..0be1f835 100644 --- a/mediagoblin/tools/response.py +++ b/mediagoblin/tools/response.py @@ -77,7 +77,7 @@ def render_http_exception(request, exc, description): elif stock_desc and exc.code == 404: return render_404(request) - return render_error(request, title=exc.args[0], + return render_error(request, title='{0} {1}'.format(exc.code, exc.name), err_msg=description, status=exc.code) diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index 3d651a6e..615ce129 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -71,6 +71,7 @@ def get_jinja_env(template_loader, locale): template_env.globals['app_config'] = mg_globals.app_config template_env.globals['global_config'] = mg_globals.global_config template_env.globals['version'] = _version.__version__ + template_env.globals['auth'] = mg_globals.app.auth template_env.filters['urlencode'] = url_quote_plus |