From 158ae461e8c13eea56ce5755a229f461bbf5efa1 Mon Sep 17 00:00:00 2001
From: decalage2 <decalage@laposte.net>
Date: Mon, 13 Jun 2016 23:00:43 +0200
Subject: [PATCH] colorclass: temporary fix for import issue on MacOSX (issue #51)

---
 oletools/thirdparty/colorclass/__init__.py | 20 ++++++++++----------
 oletools/thirdparty/colorclass/__main__.py | 12 ++++++------
 oletools/thirdparty/colorclass/color.py    |  2 +-
 oletools/thirdparty/colorclass/core.py     |  6 +++---
 oletools/thirdparty/colorclass/parse.py    |  2 +-
 oletools/thirdparty/colorclass/search.py   |  2 +-
 oletools/thirdparty/colorclass/toggles.py  |  2 +-
 oletools/thirdparty/colorclass/windows.py  |  4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/oletools/thirdparty/colorclass/__init__.py b/oletools/thirdparty/colorclass/__init__.py
index cae4016..e979045 100644
--- a/oletools/thirdparty/colorclass/__init__.py
+++ b/oletools/thirdparty/colorclass/__init__.py
@@ -8,16 +8,16 @@ https://github.com/Robpol86/colorclass
 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__ = (
diff --git a/oletools/thirdparty/colorclass/__main__.py b/oletools/thirdparty/colorclass/__main__.py
index d8f3f00..a897052 100644
--- a/oletools/thirdparty/colorclass/__main__.py
+++ b/oletools/thirdparty/colorclass/__main__.py
@@ -9,12 +9,12 @@ from __future__ import print_function
 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')
 
diff --git a/oletools/thirdparty/colorclass/color.py b/oletools/thirdparty/colorclass/color.py
index 2849d06..45ce8ae 100644
--- a/oletools/thirdparty/colorclass/color.py
+++ b/oletools/thirdparty/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):
diff --git a/oletools/thirdparty/colorclass/core.py b/oletools/thirdparty/colorclass/core.py
index 481bb40..4d62330 100644
--- a/oletools/thirdparty/colorclass/core.py
+++ b/oletools/thirdparty/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'')
 
diff --git a/oletools/thirdparty/colorclass/parse.py b/oletools/thirdparty/colorclass/parse.py
index 46dc28e..7f82c99 100644
--- a/oletools/thirdparty/colorclass/parse.py
+++ b/oletools/thirdparty/colorclass/parse.py
@@ -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
diff --git a/oletools/thirdparty/colorclass/search.py b/oletools/thirdparty/colorclass/search.py
index 555402d..4065f4c 100644
--- a/oletools/thirdparty/colorclass/search.py
+++ b/oletools/thirdparty/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):
diff --git a/oletools/thirdparty/colorclass/toggles.py b/oletools/thirdparty/colorclass/toggles.py
index 1ba6bce..8665ff9 100644
--- a/oletools/thirdparty/colorclass/toggles.py
+++ b/oletools/thirdparty/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():
diff --git a/oletools/thirdparty/colorclass/windows.py b/oletools/thirdparty/colorclass/windows.py
index 8f69478..69ddbd3 100644
--- a/oletools/thirdparty/colorclass/windows.py
+++ b/oletools/thirdparty/colorclass/windows.py
@@ -7,8 +7,8 @@ import ctypes
 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
--
libgit2 0.21.4