Merge pull request #23 from jiri-otoupal/docs-import-fix

Imports fix
jiri-otoupal · May 11, 2022 · 3ae1d26 · 3ae1d26
2 parents a84a2bb + 0cd1642
commit 3ae1d26
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 29 deletions.
diff --git a/pycrosskit/__version__.py b/pycrosskit/__version__.py
@@ -11,7 +11,7 @@
     "variables and shortcuts easy "
 )
 
-__version__ = "1.6.5"
+__version__ = "1.6.6"
 __author__ = "Jiri Otoupal"
 __author_email__ = "jiri-otoupal@ips-database.eu"
 __license__ = "Apache 2.0"

diff --git a/pycrosskit/constants.py b/pycrosskit/constants.py
@@ -0,0 +1,3 @@
+from collections import namedtuple
+
+UserFolders = namedtuple("UserFolders", ("home", "desktop", "startmenu"))
diff --git a/pycrosskit/shortcut_platforms/linux.py b/pycrosskit/shortcut_platforms/linux.py
@@ -7,7 +7,8 @@
 from pathlib import Path
 from typing import Tuple
 
-from pycrosskit.shortcuts import UserFolders, Shortcut
+from pycrosskit.constants import UserFolders
+from pycrosskit.shortcuts import Shortcut
 
 scut_ext = ".desktop"
 ico_ext = ("ico", "svg", "png")
@@ -89,7 +90,7 @@ def get_folders() -> UserFolders:
 
 
 def create_shortcut(
-    shortcut_instance: Shortcut, desktop: bool = False, startmenu: bool = False
+        shortcut_instance: Shortcut, desktop: bool = False, startmenu: bool = False
 ):
     """Creates shortcut on the system.
 
@@ -114,8 +115,8 @@ def create_shortcut(
             name=shortcut_instance.shortcut_name,
             desc=shortcut_instance.description,
             exe=f"bash -c "
-            f"'cd {shortcut_instance.work_path}"
-            f" && {shortcut_instance.exec_path}'",
+                f"'cd {shortcut_instance.work_path}"
+                f" && {shortcut_instance.exec_path}'",
             icon=shortcut_instance.icon_path,
             args=shortcut_instance.arguments,
         )

diff --git a/pycrosskit/shortcut_platforms/windows.py b/pycrosskit/shortcut_platforms/windows.py
@@ -10,7 +10,8 @@
 import win32com.client
 from win32comext.shell import shell, shellcon
 
-from pycrosskit.shortcuts import UserFolders, Shortcut
+from pycrosskit.constants import UserFolders
+from pycrosskit.shortcuts import Shortcut
 
 scut_ext = ".lnk"
 ico_ext = ("ico",)

diff --git a/pycrosskit/shortcuts.py b/pycrosskit/shortcuts.py
@@ -1,34 +1,23 @@
 #! python3  # noqa: E265
 
-# -- IMPORTS
-
 # standard
 import os
-from collections import namedtuple
 from typing import Tuple
 
+
 # conditional
-if os.name == "nt":
-    from pycrosskit.shortcut_platforms.windows import (create_shortcut,
-                                                       delete_shortcut)
-else:
-    from pycrosskit.shortcut_platforms.linux import (create_shortcut,
-                                                     delete_shortcut)
 
-# -- GLOBALS
-UserFolders = namedtuple("UserFolders", ("home", "desktop", "startmenu"))
 
-# -- CLASSES
 class Shortcut:
     def __init__(
-        self,
-        shortcut_name: str,
-        exec_path: str,
-        description: str = "",
-        icon_path: str = "",
-        desktop: bool = False,
-        start_menu: bool = False,
-        work_dir: str = None,
+            self,
+            shortcut_name: str,
+            exec_path: str,
+            description: str = "",
+            icon_path: str = "",
+            desktop: bool = False,
+            start_menu: bool = False,
+            work_dir: str = None,
     ):
         """Initialize a shortcut object.
 
@@ -48,22 +37,32 @@ def __init__(
         self.icon_path = str(icon_path)
         self.work_path = str(work_dir)
 
+        if os.name == "nt":
+            from pycrosskit.shortcut_platforms.windows import create_shortcut
+        else:
+            from pycrosskit.shortcut_platforms.linux import create_shortcut
+
         # create shortcut
         self.desktop_path, self.startmenu_path = create_shortcut(
             self, start_menu, desktop
         )
 
     @staticmethod
     def delete(
-        shortcut_name: str, desktop: bool = False, start_menu: bool = False
+            shortcut_name: str, desktop: bool = False, start_menu: bool = False
     ) -> Tuple[str, str]:
         """Remove existing Shortcut from the system.
 
         :param str shortcut_name: Name of shortcut
         :param bool desktop: Delete Shortcut on Desktop
         :param bool start_menu: Delete Shortcut on Start Menu
 
-        :return: desktop and startmenu path
-        :return Tuple[str, str]: desktop_path, startmenu_path
+        :return: desktop and start menu path
+        :return Tuple[str, str]: desktop_path, start menu path
         """
+        if os.name == "nt":
+            from pycrosskit.shortcut_platforms.windows import delete_shortcut
+        else:
+            from pycrosskit.shortcut_platforms.linux import delete_shortcut
+
         return delete_shortcut(shortcut_name, desktop, start_menu)