|
92 | 92 | # this package
|
93 | 93 | import domdf_python_tools.words
|
94 | 94 | from domdf_python_tools import __version__, iterative
|
95 |
| -from domdf_python_tools.terminal_colours import Colour, Fore |
96 | 95 | from domdf_python_tools.typing import HasHead, String
|
97 | 96 |
|
98 | 97 | if typing.TYPE_CHECKING or domdf_python_tools.__docs: # pragma: no cover
|
99 | 98 | # 3rd party
|
100 | 99 | from pandas import DataFrame, Series # type: ignore
|
101 | 100 |
|
| 101 | + # this package |
| 102 | + from domdf_python_tools.terminal_colours import Colour, Fore |
| 103 | + |
102 | 104 | Series.__module__ = "pandas"
|
103 | 105 | DataFrame.__module__ = "pandas"
|
104 | 106 |
|
@@ -626,8 +628,8 @@ def coloured_diff(
|
626 | 628 | tofiledate: str = '',
|
627 | 629 | n: int = 3,
|
628 | 630 | lineterm: str = '\n',
|
629 |
| - removed_colour: Colour = Fore.RED, |
630 |
| - added_colour: Colour = Fore.GREEN, |
| 631 | + removed_colour: Optional["Colour"] = None, |
| 632 | + added_colour: Optional["Colour"] = None, |
631 | 633 | ) -> str:
|
632 | 634 | r"""
|
633 | 635 | Compare two sequences of lines; generate the delta as a unified diff.
|
@@ -682,6 +684,15 @@ def coloured_diff(
|
682 | 684 | # this package
|
683 | 685 | from domdf_python_tools.stringlist import StringList
|
684 | 686 |
|
| 687 | + with warnings.catch_warnings(): |
| 688 | + warnings.simplefilter("ignore", DeprecationWarning) |
| 689 | + |
| 690 | + # this package |
| 691 | + from domdf_python_tools.terminal_colours import Fore |
| 692 | + |
| 693 | + removed_colour = removed_colour or Fore.RED |
| 694 | + added_colour = added_colour or Fore.GREEN |
| 695 | + |
685 | 696 | buf = StringList()
|
686 | 697 | diff = difflib.unified_diff(a, b, fromfile, tofile, fromfiledate, tofiledate, n, lineterm)
|
687 | 698 |
|
|
0 commit comments