some test and flake fixes

news/lscolors.rst

@@ -30,10 +30,8 @@
   ``detype()`` method in order to detype it.
 * New ``xonsh.tools.always_none()`` function that simply returns None.
 
-
 **Changed:**
 
-
 * The black and white style ``bw`` now uses actual black and white
   ANSI colore codes for its colors, rather than just empty color
   sequences.

tests/test_environ.py

@@ -6,13 +6,14 @@ import tempfile
 import builtins
 import itertools
 from tempfile import TemporaryDirectory
-from xonsh.tools import ON_WINDOWS
+from xonsh.tools import ON_WINDOWS, always_true
 
 import pytest
 
 from xonsh.commands_cache import CommandsCache
 from xonsh.environ import (
     Env,
+    Ensurer,
     locate_binary,
     DEFAULT_ENSURERS,
     DEFAULT_VALUES,
@@ -67,6 +68,7 @@ def test_env_detype_mutable_access_clear(path1, path2):
 
 def test_env_detype_no_dict():
     env = Env(YO={"hey": 42})
+    env.get_ensurer('YO', default=Ensurer(always_true, None, None))
     det = env.detype()
     assert "YO" not in det
 

xonsh/ansi_colors.py

@@ -13,7 +13,6 @@ from xonsh.color_tools import (
     find_closest_color,
     rgb2short,
     rgb_to_256,
-    rgb_to_ints,
     short_to_ints,
 )
 from xonsh.tools import FORMATTER

xonsh/color_tools.py

@@ -9,7 +9,6 @@ import re
 import math
 
 from xonsh.lazyasd import lazyobject, LazyObject
-from xonsh.tools import deprecated
 
 
 RE_BACKGROUND = LazyObject(

xonsh/environ.py

@@ -32,7 +32,6 @@ from xonsh.style_tools import PTK2_STYLE
 from xonsh.tools import (
     always_true,
     always_false,
-    always_none,
     detype,
     ensure_string,
     is_env_path,