From f6114c0544fd4a0155080343b2927acca6631154 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Thu, 18 May 2023 16:21:56 -0400
Subject: [PATCH] Use plugin's psutil

---
 coreplugins/diagnostic/plugin.py | 8 ++++++--
 requirements.txt                 | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/coreplugins/diagnostic/plugin.py b/coreplugins/diagnostic/plugin.py
index 68489e31..170ebf4e 100644
--- a/coreplugins/diagnostic/plugin.py
+++ b/coreplugins/diagnostic/plugin.py
@@ -2,12 +2,12 @@ from rest_framework.response import Response
 from rest_framework import status, permissions
 from rest_framework.decorators import api_view, permission_classes
 
-from app.plugins import PluginBase, Menu, MountPoint
+from app.plugins import PluginBase, Menu, MountPoint, get_current_plugin
 from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import gettext as _
 
-import json, shutil, psutil
+import json, shutil
 
 def get_memory_stats():
     """
@@ -35,6 +35,10 @@ def get_memory_stats():
         return {}
 
 def get_diagnostic_stats():
+    plugin = get_current_plugin()
+    with plugin.python_imports():
+        import psutil
+
     # Disk space
     total_disk_space, used_disk_space, free_disk_space = shutil.disk_usage('./')
 
diff --git a/requirements.txt b/requirements.txt
index 5dd84987..1f02f398 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -63,4 +63,3 @@ eventlet==0.32.0 ; sys_platform == "win32"
 pyopenssl==19.1.0 ; sys_platform == "win32"
 numpy==1.21.1
 drf-yasg==1.20.0
-psutil==5.9.5