mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 03:31:04 +01:00
Code Issues Releases Wiki Activity

Merge branch 'remove-embedly-filter' of https://github.com/kaedroho/wagtail into kaedroho-remove-embedly-filter

Browse Source 
Conflicts:
	wagtail/wagtailembeds/tests.py
This commit is contained in:
Matt Westcott 2014-07-17 12:33:13 +01:00
commit ec47e00e21
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wagtail/wagtailembeds/templatetags/embed_filters.py
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

9
wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
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)

2
wagtail/wagtailembeds/tests.py
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):