Merge branch 'kaedroho-remove-embedly-filter'

This commit is contained in:
Matt Westcott 2014-07-17 12:33:27 +01:00
commit 1a9f265354
3 changed files with 2 additions and 11 deletions

View file

@ -5,4 +5,4 @@ warnings.warn(
"Use {% load wagtailembeds_tags %} instead.", DeprecationWarning)
from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import register, embed, embedly
from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import register, embed

View file

@ -19,12 +19,3 @@ def embed(url, max_width=None):
return ''
except:
return ''
@register.filter
def embedly(url, max_width=None):
warnings.warn(
"The 'embedly' filter has been renamed. "
"Use 'embed' instead.", DeprecationWarning)
return embed(url, max_width)

View file

@ -22,7 +22,7 @@ from wagtail.wagtailembeds.embeds import (
AccessDeniedEmbedlyException,
)
from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly, oembed as wagtail_oembed
from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import embed as embed_filter, embedly as embedly_filter
from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import embed as embed_filter
class TestEmbeds(TestCase):