From 8b283cdac743e8e2c31f2a67f5f4165bfec267a0 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 20 Dec 2015 12:57:37 +0000
Subject: [PATCH] deprecation/1.4: Removed fallback to EMBEDLY_KEY setting

Now must be WAGTAILEMBEDS_EMBEDLY_KEY
---
 wagtail/wagtailembeds/embeds.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py
index c99340e91f..e4887ed6ad 100644
--- a/wagtail/wagtailembeds/embeds.py
+++ b/wagtail/wagtailembeds/embeds.py
@@ -1,6 +1,5 @@
 from datetime import datetime
 import json
-import warnings
 
 # Needs to be imported like this to allow @patch to work in tests
 from django.utils.six.moves.urllib import request as urllib_request
@@ -12,7 +11,6 @@ from django.conf import settings
 
 from wagtail.wagtailembeds.oembed_providers import get_oembed_provider
 from wagtail.wagtailembeds.models import Embed
-from wagtail.utils.deprecation import RemovedInWagtail14Warning
 
 
 class EmbedException(Exception):
@@ -36,13 +34,7 @@ def embedly(url, max_width=None, key=None):
 
     # Get embedly key
     if key is None:
-        try:
-            key = settings.WAGTAILEMBEDS_EMBEDLY_KEY
-        except AttributeError:
-            key = settings.EMBEDLY_KEY
-            warnings.warn(
-                "EMBEDLY_KEY is now deprecated. Use WAGTAILEMBEDS_EMBEDLY_KEY instead",
-                RemovedInWagtail14Warning)
+        key = settings.WAGTAILEMBEDS_EMBEDLY_KEY
 
     # Get embedly client
     client = Embedly(key=key)