simplified and add some deleter

Author: LowLevelLover

halo/__init__.py

@@ -2,6 +2,8 @@
 __author__ = 'Manraj Singh'
 __email__ = '[email protected]'
 
+all = ["cursor.py", "halo_notebook.py", "halo.py"]
+
 import logging
 
 from .halo import Halo

halo/_utils.py

@@ -26,10 +26,8 @@ def is_supported():
 
     os_arch = platform.system()
 
-    if os_arch != 'Windows':
-        return True
+    return True if os_arch != 'Windows' else False
 
-    return False
 
 
 def get_environment():
@@ -42,10 +40,7 @@ def get_environment():
     """
     try:
         from IPython import get_ipython
-    except ImportError:
-        return 'terminal'
-
-    try:
+        
         shell = get_ipython().__class__.__name__
 
         if shell == 'ZMQInteractiveShell':  # Jupyter notebook or qtconsole
@@ -55,7 +50,7 @@ def get_environment():
         else:
             return 'terminal'  # Other type (?)
 
-    except NameError:
+    except (ImportError, NameError):
         return 'terminal'
 
 
@@ -90,10 +85,7 @@ def is_text_type(text):
     bool
         Whether parameter is a string or not
     """
-    if isinstance(text, six.text_type) or isinstance(text, six.string_types):
-        return True
-
-    return False
+    return True if isinstance(text, (six.text_type, six.string_types)) else False
 
 
 def decode_utf_8_text(text):
@@ -146,7 +138,4 @@ def get_terminal_columns():
 
     # If column size is 0 either we are not connected
     # to a terminal or something else went wrong. Fallback to 80.
-    if terminal_size.columns == 0:
-        return 80
-    else:
-        return terminal_size.columns
+    return 80 if terminal_size.columns == 0 else terminal_size.columns

halo/cursor.py

@@ -9,7 +9,8 @@
     import ctypes
 
     class _CursorInfo(ctypes.Structure):
-        _fields_ = [("size", ctypes.c_int), ("visible", ctypes.c_byte)]
+        _fields_ = [("size", ctypes.c_int), 
+                    ("visible", ctypes.c_byte)]
 
 
 def hide(stream=sys.stdout):

halo/halo.py

@@ -77,6 +77,15 @@ def __init__(
         stream : io, optional
             Output.
         """
+        
+        # To reset Values in deleter
+        self.reset_values = {"text": text,
+                            "color": color,
+                            "text_color": text_color,
+                            "spinner": spinner,
+                            "animation": animation,
+                            "placement": placement,}
+        
         self._color = color
         self._animation = animation
 
@@ -156,6 +165,12 @@ def spinner(self, spinner=None):
         self._frame_index = 0
         self._text_index = 0
 
+    @spinner.deleter
+    def spinner(self):
+        """set spinner to None when delete spinner is
+        """
+        self._spinner = self.reset_values["spinner"]
+
     @property
     def text(self):
         """Getter for text property.
@@ -176,6 +191,10 @@ def text(self, text):
         """
         self._text = self._get_text(text)
 
+    @text.deleter
+    def text(self):
+        self.text = self.reset_values["text"]
+
     @property
     def text_color(self):
         """Getter for text color property.
@@ -196,6 +215,10 @@ def text_color(self, text_color):
         """
         self._text_color = text_color
 
+    @text_color.deleter
+    def text_color(self):
+        self._text_color = self.reset_values["text_color"]
+
     @property
     def color(self):
         """Getter for color property.
@@ -216,6 +239,10 @@ def color(self, color):
         """
         self._color = color
 
+    @color.deleter
+    def color(self):
+        self._color = self.reset_values["color"]
+
     @property
     def placement(self):
         """Getter for placement property.
@@ -242,6 +269,10 @@ def placement(self, placement):
             )
         self._placement = placement
 
+    @placement.deleter
+    def placement(self):
+        self.placement = self.reset_values["placement"]
+
     @property
     def spinner_id(self):
         """Getter for spinner id
@@ -273,6 +304,10 @@ def animation(self, animation):
         self._animation = animation
         self._text = self._get_text(self._text["original"])
 
+    @animation.deleter
+    def animation(self):
+        self._animation = self.reset_values["animation"]
+
     def _check_stream(self):
         """Returns whether the stream is open, and if applicable, writable
         Returns
@@ -334,10 +369,7 @@ def _get_spinner(self, spinner):
             return spinner
 
         if is_supported():
-            if all([is_text_type(spinner), spinner in Spinners.__members__]):
-                return Spinners[spinner].value
-            else:
-                return default_spinner
+            return Spinners[spinner].valueif if all([is_text_type(spinner), spinner in Spinners.__members__]) else default_spinner
         else:
             return Spinners["line"].value
 
@@ -354,8 +386,8 @@ def _get_text(self, text):
         max_spinner_length = max([len(i) for i in self._spinner["frames"]])
 
         # Subtract to the current terminal size the max spinner length
-        # (-1 to leave room for the extra space between spinner and text)
-        terminal_width = get_terminal_columns() - max_spinner_length - 1
+        # (+1 to leave room for the extra space between spinner and text)
+        terminal_width = get_terminal_columns() - (max_spinner_length + 1)
         text_length = len(stripped_text)
 
         frames = []

tests/__init__.py

@@ -0,0 +1 @@
+all = ["test_halo_notebook.py", "test_halo.py"]