utils: Drop custom url_for

Since flask-0.9 we can use config.PREFERRED_URL_SCHEME.

2 files changed, 4 insertions, 15 deletions

diff --git a/accounts/forms.py b/accounts/forms.py
index 82b999e..c414e57 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 import re
-from flask import g, current_app, session, Markup
+from flask import g, current_app, session, Markup, url_for
 from flask.ext.wtf import Form
 from flask.ext.login import current_user
 from wtforms import TextField, PasswordField, ValidationError, BooleanField,\
                     validators
 from wtforms.form import FormMeta
-from utils import NotRegexp, url_for
+from utils import NotRegexp
 
 
 _username_re = re.compile(r'^[a-zA-Z][a-zA-Z0-9-]{1,15}$')
diff --git a/accounts/utils/__init__.py b/accounts/utils/__init__.py
index e584e28..0a3fa10 100644
--- a/accounts/utils/__init__.py
+++ b/accounts/utils/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import importlib
 from functools import wraps
-from flask import current_app, flash, g, redirect, render_template, request, session
-from flask import url_for as flask_url_for
+from flask import current_app, flash, g, redirect, render_template, \
+     request, session, url_for
 from flask.ext.login import current_user
 from werkzeug.exceptions import Forbidden
 from wtforms.validators import Regexp, ValidationError
@@ -59,17 +59,6 @@ class NotRegexp(Regexp):
             raise ValidationError(self.message)
 
 
-def url_for(endpoint, **values):
-    """Wrap `flask.url_for` so that it always returns https links"""
-    #XXX: Drop this in favor of config.PREFERRED_URL_SCHEME when we require Flask 0.9
-    u = flask_url_for(endpoint, **values)
-    if '_external' in values and u.startswith('http://') \
-       and current_app.config['PREFERRED_URL_SCHEME'] == 'https':
-        return 'https://' + u[7:]
-    else:
-        return u
-
-
 def get_backend(path, app):
     module = path.rsplit(".", 1).pop()
     class_name = '%sBackend' % module.title()