From 04ec1c8b56d49353865f8eb8f616c40d4ee598f0 Mon Sep 17 00:00:00 2001
From: Dave T <17680170+davet2001@users.noreply.github.com>
Date: Mon, 11 Oct 2021 23:14:04 +0100
Subject: [PATCH] Consolidate CONF_RAW_DATA_ID to const.py (#2491)

---
 esphome/components/animation/__init__.py |  4 +---
 esphome/components/font/__init__.py      |  3 +--
 esphome/components/image/__init__.py     | 11 ++++++++---
 esphome/const.py                         |  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/esphome/components/animation/__init__.py b/esphome/components/animation/__init__.py
index 3ae3aa94f9..3f03e5c185 100644
--- a/esphome/components/animation/__init__.py
+++ b/esphome/components/animation/__init__.py
@@ -5,7 +5,7 @@ from esphome.components import display, font
 import esphome.components.image as espImage
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_FILE, CONF_ID, CONF_TYPE, CONF_RESIZE
+from esphome.const import CONF_FILE, CONF_ID, CONF_RAW_DATA_ID, CONF_RESIZE, CONF_TYPE
 from esphome.core import CORE, HexInt
 
 _LOGGER = logging.getLogger(__name__)
@@ -15,8 +15,6 @@ MULTI_CONF = True
 
 Animation_ = display.display_ns.class_("Animation")
 
-CONF_RAW_DATA_ID = "raw_data_id"
-
 ANIMATION_SCHEMA = cv.Schema(
     {
         cv.Required(CONF_ID): cv.declare_id(Animation_),
diff --git a/esphome/components/font/__init__.py b/esphome/components/font/__init__.py
index 7225bf5bb9..6af5be45d4 100644
--- a/esphome/components/font/__init__.py
+++ b/esphome/components/font/__init__.py
@@ -4,7 +4,7 @@ from esphome import core
 from esphome.components import display
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_FILE, CONF_GLYPHS, CONF_ID, CONF_SIZE
+from esphome.const import CONF_FILE, CONF_GLYPHS, CONF_ID, CONF_RAW_DATA_ID, CONF_SIZE
 from esphome.core import CORE, HexInt
 
 DEPENDENCIES = ["display"]
@@ -74,7 +74,6 @@ def validate_truetype_file(value):
 DEFAULT_GLYPHS = (
     ' !"%()+=,-.:/0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz°'
 )
-CONF_RAW_DATA_ID = "raw_data_id"
 CONF_RAW_GLYPH_ID = "raw_glyph_id"
 
 FONT_SCHEMA = cv.Schema(
diff --git a/esphome/components/image/__init__.py b/esphome/components/image/__init__.py
index b946a86bc4..a721263dff 100644
--- a/esphome/components/image/__init__.py
+++ b/esphome/components/image/__init__.py
@@ -4,7 +4,14 @@ from esphome import core
 from esphome.components import display, font
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_FILE, CONF_ID, CONF_TYPE, CONF_RESIZE, CONF_DITHER
+from esphome.const import (
+    CONF_DITHER,
+    CONF_FILE,
+    CONF_ID,
+    CONF_RAW_DATA_ID,
+    CONF_RESIZE,
+    CONF_TYPE,
+)
 from esphome.core import CORE, HexInt
 
 _LOGGER = logging.getLogger(__name__)
@@ -21,8 +28,6 @@ IMAGE_TYPE = {
 
 Image_ = display.display_ns.class_("Image")
 
-CONF_RAW_DATA_ID = "raw_data_id"
-
 IMAGE_SCHEMA = cv.Schema(
     {
         cv.Required(CONF_ID): cv.declare_id(Image_),
diff --git a/esphome/const.py b/esphome/const.py
index 780f4f6e22..a9eec3e249 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -533,6 +533,7 @@ CONF_RANGE_FROM = "range_from"
 CONF_RANGE_TO = "range_to"
 CONF_RATE = "rate"
 CONF_RAW = "raw"
+CONF_RAW_DATA_ID = "raw_data_id"
 CONF_RC_CODE_1 = "rc_code_1"
 CONF_RC_CODE_2 = "rc_code_2"
 CONF_REACTIVE_POWER = "reactive_power"