Merge pull request #239 from Siddhesh-Agarwal/master

Important fix and small improvement

Author: Ankit404butfound

pywhatkit/__init__.py

@@ -11,7 +11,7 @@
 from pywhatkit.ascii_art import image_to_ascii_art
 from pywhatkit.handwriting import text_to_handwriting
 from pywhatkit.mail import send_hmail, send_mail
-from pywhatkit.misc import info, playonyt, search, show_history, web_screenshot
+from pywhatkit.misc import info, playonyt, search, show_history, take_screenshot
 from pywhatkit.sc import cancel_shutdown, shutdown
 from pywhatkit.whats import (
     open_web,
@@ -22,8 +22,9 @@
     sendwhats_image,
 )
 
-if system().lower() in ("darwin", "windows"):
+_system = system().lower()
+if _system in ("darwin", "windows"):
     from pywhatkit.misc import take_screenshot
 
-if system().lower() == "windows":
+if _system == "windows":
     from pywhatkit.remotekit import start_server

pywhatkit/core/core.py

@@ -6,15 +6,7 @@
 from webbrowser import open
 
 import requests
-from pyautogui import (
-    click,
-    hotkey,
-    locateOnScreen,
-    moveTo,
-    press,
-    size,
-    typewrite,
-)
+from pyautogui import click, hotkey, locateOnScreen, moveTo, press, size, typewrite
 
 from pywhatkit.core.exceptions import InternetException
 
@@ -31,12 +23,13 @@ def close_tab(wait_time: int = 2) -> None:
     """Closes the Currently Opened Browser Tab"""
 
     time.sleep(wait_time)
-    if system().lower() in ("windows", "linux"):
+    _system = system().lower()
+    if _system in ("windows", "linux"):
         hotkey("ctrl", "w")
-    elif system().lower() == "darwin":
+    elif _system == "darwin":
         hotkey("command", "w")
     else:
-        raise Warning(f"{system().lower()} not supported!")
+        raise Warning(f"{_system} not supported!")
     press("enter")
 
 
@@ -96,7 +89,8 @@ def send_message(message: str, receiver: str, wait_time: int) -> None:
 def copy_image(path: str) -> None:
     """Copy the Image to Clipboard based on the Platform"""
 
-    if system().lower() == "linux":
+    _system = system().lower()
+    if _system == "linux":
         if pathlib.Path(path).suffix in (".PNG", ".png"):
             os.system(f"copyq copy image/png - < {path}")
         elif pathlib.Path(path).suffix in (".jpg", ".JPG", ".jpeg", ".JPEG"):
@@ -105,7 +99,7 @@ def copy_image(path: str) -> None:
             raise Exception(
                 f"File Format {pathlib.Path(path).suffix} is not Supported!"
             )
-    elif system().lower() == "windows":
+    elif _system == "windows":
         from io import BytesIO
 
         import win32clipboard  # pip install pywin32
@@ -120,7 +114,7 @@ def copy_image(path: str) -> None:
         win32clipboard.EmptyClipboard()
         win32clipboard.SetClipboardData(win32clipboard.CF_DIB, data)
         win32clipboard.CloseClipboard()
-    elif system().lower() == "darwin":
+    elif _system == "darwin":
         if pathlib.Path(path).suffix in (".jpg", ".jpeg", ".JPG", ".JPEG"):
             os.system(
                 f"osascript -e 'set the clipboard to (read (POSIX file \"{path}\") as JPEG picture)'"
@@ -130,7 +124,7 @@ def copy_image(path: str) -> None:
                 f"File Format {pathlib.Path(path).suffix} is not Supported!"
             )
     else:
-        raise Exception(f"Unsupported System: {system().lower()}")
+        raise Exception(f"Unsupported System: {_system}")
 
 
 def send_image(path: str, caption: str, receiver: str, wait_time: int) -> None: