From e3d5c73c8ba9f579dbeeb263770a8ace436d93e7 Mon Sep 17 00:00:00 2001 From: Kibzik Date: Mon, 9 Jan 2023 20:54:26 +0300 Subject: [PATCH] Change package names of webcolors --- src/util/color_reader.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/color_reader.py b/src/util/color_reader.py index 31bab3b..f6df576 100644 --- a/src/util/color_reader.py +++ b/src/util/color_reader.py @@ -1,13 +1,13 @@ import re from typing import Tuple from colorsys import hls_to_rgb -from webcolors import html4_hex_to_names, hex_to_rgb, rgb_to_name, rgb_percent_to_hex, rgb_to_hex, css3_names_to_hex +from webcolors import HTML4_HEX_TO_NAMES, hex_to_rgb, rgb_to_name, rgb_percent_to_hex, rgb_to_hex, CSS3_NAMES_TO_HEX def closest_colour_rgb(requested_color: Tuple[int, ...]) -> str: """ Function finds closes colour rgb """ min_colours = {} - for key, name in html4_hex_to_names.items(): + for key, name in HTML4_HEX_TO_NAMES.items(): r_c, g_c, b_c = hex_to_rgb(key) rd = (r_c - requested_color[0]) ** 2 gd = (g_c - requested_color[1]) ** 2 @@ -76,7 +76,7 @@ def str2closest_html_color_name(s: str) -> str: return name - elif s in html4_hex_to_names.items(): + elif s in HTML4_HEX_TO_NAMES.items(): return s else: return "" @@ -124,8 +124,8 @@ def str2hex(s: str) -> str: rgb = rgba2rgb(*rgb, alpha) return rgb_to_hex(rgb) - if s.lower() in css3_names_to_hex: - return css3_names_to_hex[s.lower()] + if s.lower() in CSS3_NAMES_TO_HEX: + return CSS3_NAMES_TO_HEX[s.lower()] return ""