Skip to content
This repository has been archived by the owner on Dec 13, 2020. It is now read-only.

Commit

Permalink
Merge 5e0cb09 into c7ed6d7
Browse files Browse the repository at this point in the history
  • Loading branch information
decalage2 committed Jun 14, 2016
2 parents c7ed6d7 + 5e0cb09 commit 46b02b0
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
20 changes: 10 additions & 10 deletions colorclass/__init__.py
Expand Up @@ -8,16 +8,16 @@
https://pypi.python.org/pypi/colorclass
"""

from colorclass.codes import list_tags # noqa
from colorclass.color import Color # noqa
from colorclass.toggles import disable_all_colors # noqa
from colorclass.toggles import disable_if_no_tty # noqa
from colorclass.toggles import enable_all_colors # noqa
from colorclass.toggles import is_enabled # noqa
from colorclass.toggles import is_light # noqa
from colorclass.toggles import set_dark_background # noqa
from colorclass.toggles import set_light_background # noqa
from colorclass.windows import Windows # noqa
from .codes import list_tags # noqa
from .color import Color # noqa
from .toggles import disable_all_colors # noqa
from .toggles import disable_if_no_tty # noqa
from .toggles import enable_all_colors # noqa
from .toggles import is_enabled # noqa
from .toggles import is_light # noqa
from .toggles import set_dark_background # noqa
from .toggles import set_light_background # noqa
from .windows import Windows # noqa


__all__ = (
Expand Down
12 changes: 6 additions & 6 deletions colorclass/__main__.py
Expand Up @@ -9,12 +9,12 @@
import fileinput
import os

from colorclass.color import Color
from colorclass.toggles import disable_all_colors
from colorclass.toggles import enable_all_colors
from colorclass.toggles import set_dark_background
from colorclass.toggles import set_light_background
from colorclass.windows import Windows
from .color import Color
from .toggles import disable_all_colors
from .toggles import enable_all_colors
from .toggles import set_dark_background
from .toggles import set_light_background
from .windows import Windows

TRUTHY = ('true', '1', 'yes', 'on')

Expand Down
2 changes: 1 addition & 1 deletion colorclass/color.py
@@ -1,6 +1,6 @@
"""Color class used by library users."""

from colorclass.core import ColorStr
from .core import ColorStr


class Color(ColorStr):
Expand Down
6 changes: 3 additions & 3 deletions colorclass/core.py
@@ -1,8 +1,8 @@
"""String subclass that handles ANSI color codes."""

from colorclass.codes import ANSICodeMapping
from colorclass.parse import parse_input, RE_SPLIT
from colorclass.search import build_color_index, find_char_color
from .codes import ANSICodeMapping
from .parse import parse_input, RE_SPLIT
from .search import build_color_index, find_char_color

PARENT_CLASS = type(u'')

Expand Down
2 changes: 1 addition & 1 deletion colorclass/parse.py
Expand Up @@ -2,7 +2,7 @@

import re

from colorclass.codes import ANSICodeMapping, BASE_CODES
from .codes import ANSICodeMapping, BASE_CODES

CODE_GROUPS = (
tuple(set(str(i) for i in BASE_CODES.values() if i and (40 <= i <= 49 or 100 <= i <= 109))), # bg colors
Expand Down
2 changes: 1 addition & 1 deletion colorclass/search.py
@@ -1,6 +1,6 @@
"""Determine color of characters that may or may not be adjacent to ANSI escape sequences."""

from colorclass.parse import RE_SPLIT
from .parse import RE_SPLIT


def build_color_index(ansi_string):
Expand Down
2 changes: 1 addition & 1 deletion colorclass/toggles.py
@@ -1,6 +1,6 @@
"""Convenience functions to enable/disable features."""

from colorclass.codes import ANSICodeMapping
from .codes import ANSICodeMapping


def disable_all_colors():
Expand Down
4 changes: 2 additions & 2 deletions colorclass/windows.py
Expand Up @@ -7,8 +7,8 @@
import re
import sys

from colorclass.codes import ANSICodeMapping, BASE_CODES
from colorclass.core import RE_SPLIT
from .codes import ANSICodeMapping, BASE_CODES
from .core import RE_SPLIT

ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
INVALID_HANDLE_VALUE = -1
Expand Down

0 comments on commit 46b02b0

Please sign in to comment.