From eaa367a5c9ac05e32cbc8098e7ab0cdfb3bc40bd Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 2 May 2021 02:14:28 -0600 Subject: [PATCH] Fix imports under Windows --- scripts/wk/__init__.py | 7 +++++-- scripts/wk/hw/__init__.py | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/wk/__init__.py b/scripts/wk/__init__.py index d3cc30b4..16692557 100644 --- a/scripts/wk/__init__.py +++ b/scripts/wk/__init__.py @@ -1,24 +1,27 @@ """WizardKit: wk module init""" # vim: sts=2 sw=2 ts=2 +import platform from sys import version_info as version from wk import cfg from wk import debug from wk import exe -from wk import graph from wk import hw from wk import io from wk import kit from wk import log from wk import net from wk import os -from wk import osticket from wk import repairs from wk import std from wk import sw from wk import tmux +if platform.system() != 'Windows': + from wk import graph + from wk import osticket + # Check env if version < (3, 7): diff --git a/scripts/wk/hw/__init__.py b/scripts/wk/hw/__init__.py index ad2b04cb..6486c045 100644 --- a/scripts/wk/hw/__init__.py +++ b/scripts/wk/hw/__init__.py @@ -1,6 +1,10 @@ """WizardKit: hw module init""" -from wk.hw import ddrescue -from wk.hw import diags +import platform + from wk.hw import obj from wk.hw import sensors + +if platform.system() != 'Windows': + from wk.hw import ddrescue + from wk.hw import diags