Relax color check as colorama is only required on Windows

Author: uzlonewolf

tinytuya/core/core.py

@@ -86,6 +86,8 @@
 except ImportError:
     HAVE_COLORAMA = False
 
+HAVE_COLOR = HAVE_COLORAMA or not sys.platform.startswith('win')
+
 from .crypto_helper import AESCipher
 
 # Backward compatibility for python2
@@ -130,7 +132,7 @@ def hex2bin(x):
 
 def set_debug(toggle=True, color=True):
     """Enable tinytuya verbose logging"""
-    color = color and HAVE_COLORAMA
+    color = color and HAVE_COLOR
     if toggle:
         if color:
             logging.basicConfig(
@@ -204,7 +206,7 @@ def appenddevice(newdevice, devices):
 
 # Terminal color helper
 def termcolor(color=True):
-    color = color and HAVE_COLORAMA
+    color = color and HAVE_COLOR
     if color is False:
         # Disable Terminal Color Formatting
         bold = subbold = normal = dim = alert = alertdim = cyan = red = yellow = ""

tinytuya/scanner.py

@@ -33,6 +33,7 @@
 except ImportError:
     HAVE_COLORAMA = False
 
+HAVE_COLOR = HAVE_COLORAMA or not sys.platform.startswith('win')
 
 # Optional libraries required for forced scanning
 #try:
@@ -1153,7 +1154,7 @@ def devices(verbose=False, scantime=None, color=True, poll=True, forcescan=False
 
     """
     # Terminal formatting
-    color = color and HAVE_COLORAMA
+    color = color and HAVE_COLOR
     termcolors = tinytuya.termcolor(color)
     #(bold, subbold, normal, dim, alert, alertdim, cyan, red, yellow) = termcolors
     term = TermColors( *termcolors )
@@ -1928,7 +1929,7 @@ def snapshot(color=True, assume_yes=False, skip_poll=None):
         skip_poll = True or False, auto-answer 'no' to "Poll local devices?" (overrides assume_yes)
     """
     # Terminal formatting
-    color = color and HAVE_COLORAMA
+    color = color and HAVE_COLOR
     termcolors = tinytuya.termcolor(color)
     term = TermColors( *termcolors )
 
@@ -2001,7 +2002,7 @@ def alldevices(color=True, scantime=None, forcescan=False, discover=True, assume
         color = True or False, print output in color [Default: True]
     """
     # Terminal formatting
-    color = color and HAVE_COLORAMA
+    color = color and HAVE_COLOR
     #(bold, subbold, normal, dim, alert, alertdim, cyan, red, yellow) = tinytuya.termcolor(color)
     termcolors = tinytuya.termcolor(color)
     term = TermColors( *termcolors )
@@ -2041,7 +2042,7 @@ def alldevices(color=True, scantime=None, forcescan=False, discover=True, assume
     return
 
 def poll_and_display( tuyadevices, color=True, scantime=None, snapshot=False, forcescan=False, discover=True ): # pylint: disable=W0621
-    color = color and HAVE_COLORAMA
+    color = color and HAVE_COLOR
     termcolors = tinytuya.termcolor(color)
     term = TermColors( *termcolors )
 

tinytuya/wizard.py

@@ -26,13 +26,16 @@
 import json
 from datetime import datetime
 import tinytuya
+import sys
 
 try:
     from colorama import init
     HAVE_COLORAMA = True
 except ImportError:
     HAVE_COLORAMA = False
 
+HAVE_COLOR = HAVE_COLORAMA or not sys.platform.startswith('win')
+
 # Backward compatibility for python2
 try:
     input = raw_input
@@ -120,7 +123,7 @@ def wizard(color=True, retries=None, forcescan=False, nocloud=False, assume_yes=
     except:
         old_devices = {}
 
-    color = color and HAVE_COLORAMA
+    color = color and HAVE_COLOR
     (bold, subbold, normal, dim, alert, alertdim, cyan, red, yellow) = tinytuya.termcolor(color)
 
     print(bold + 'TinyTuya Setup Wizard' + dim + ' [%s]' % (tinytuya.version) + normal)