Merge pull request #644 from acepace/bugfix/remove_wmi_requirement_fr…

…om_non_windows Bugfix/remove wmi requirement from non windows
guardicore · May 11, 2020 · c700412 · c700412
2 parents e73c1d0 + 1f11173
commit c700412
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 29 deletions.
diff --git a/monkey/common/utils/mongo_utils.py b/monkey/common/utils/mongo_utils.py
@@ -1,5 +1,7 @@
-import wmi
-import win32com
+import sys
+if sys.platform == 'win32':
+    import win32com
+    import wmi
 
 __author__ = 'maor.rayzin'
 

diff --git a/monkey/common/utils/reg_utils.py b/monkey/common/utils/reg_utils.py
diff --git a/monkey/infection_monkey/requirements.txt b/monkey/infection_monkey/requirements.txt
@@ -13,8 +13,7 @@ ipaddress
 # See breaking change here: https://github.com/tjguk/wmi/commit/dcf8e3eca79bb8c0101ffb83e25c066b0ba9e16d
 # Causes pip to error with:
 # Could not find a version that satisfies the requirement pywin32 (from wmi->-r /src/infection_monkey/requirements.txt (line 12)) (from versions: none)
-wmi==1.4.9
-pywin32 ; sys_platform == 'win32'
+wmi==1.4.9 ; sys_platform == 'win32'
 pymssql<3.0
 pyftpdlib
 WinSys-3.x