diff --git a/r2/r2/controllers/mediaembed.py b/r2/r2/controllers/mediaembed.py index 51316b80d..756259435 100644 --- a/r2/r2/controllers/mediaembed.py +++ b/r2/r2/controllers/mediaembed.py @@ -20,15 +20,14 @@ # Inc. All Rights Reserved. ############################################################################### -from reddit_base import MinimalController - -from r2.lib.scraper import get_media_embed -from r2.lib.pages import MediaEmbedBody -from r2.lib.validator import * - -from pylons import request +from pylons import request, g from pylons.controllers.util import abort +from r2.controllers.reddit_base import MinimalController +from r2.lib.pages import MediaEmbedBody +from r2.lib.scraper import get_media_embed +from r2.lib.validator import validate, VLink + class MediaembedController(MinimalController): @validate(link = VLink('link')) diff --git a/r2/r2/templates/ads.html b/r2/r2/templates/ads.html index 16a5cef03..f72411a37 100644 --- a/r2/r2/templates/ads.html +++ b/r2/r2/templates/ads.html @@ -21,9 +21,7 @@ ############################################################################### <%! - from r2.lib.template_helpers import get_domain, static from r2.lib import tracking - import random %>