From 3ae70e4fe023d743bd95b0073cad40c7f23e4b09 Mon Sep 17 00:00:00 2001
From: Dpeta <69427753+Dpeta@users.noreply.github.com>
Date: Sat, 14 Jan 2023 23:10:19 +0100
Subject: [PATCH] More aggressive autoflake

---
 convo.py      | 1 -
 dataobjs.py   | 1 -
 irc.py        | 1 -
 memos.py      | 1 -
 mood.py       | 4 ++--
 parsetools.py | 1 -
 pesterchum.py | 4 ++--
 pyquirks.py   | 1 -
 randomer.py   | 1 -
 setup.py      | 1 -
 10 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/convo.py b/convo.py
index 61b33a2..eda8da1 100644
--- a/convo.py
+++ b/convo.py
@@ -11,7 +11,6 @@ except ImportError:
     from PyQt5 import QtCore, QtGui, QtWidgets
     from PyQt5.QtWidgets import QAction, QShortcut
 
-import ostools
 from dataobjs import PesterHistory
 from parsetools import convertTags, lexMessage, mecmd, colorBegin, colorEnd, smiledict
 import parsetools
diff --git a/dataobjs.py b/dataobjs.py
index 11eba6c..80761a6 100644
--- a/dataobjs.py
+++ b/dataobjs.py
@@ -1,5 +1,4 @@
 import logging
-import ostools
 
 PchumLog = logging.getLogger("pchumLogger")
 try:
diff --git a/irc.py b/irc.py
index ada4891..fc74fb9 100644
--- a/irc.py
+++ b/irc.py
@@ -10,7 +10,6 @@ except ImportError:
     print("PyQt5 fallback (irc.py)")
     from PyQt5 import QtCore, QtGui
 
-import ostools
 from mood import Mood
 from dataobjs import PesterProfile
 from generic import PesterList
diff --git a/memos.py b/memos.py
index 21f9f95..7a91596 100644
--- a/memos.py
+++ b/memos.py
@@ -11,7 +11,6 @@ except ImportError:
     from PyQt5 import QtCore, QtGui, QtWidgets
     from PyQt5.QtWidgets import QAction
 
-import ostools
 import parsetools
 from dataobjs import PesterProfile, PesterHistory
 from generic import PesterIcon, RightClickList, mysteryTime
diff --git a/mood.py b/mood.py
index 749df7c..0dc566e 100644
--- a/mood.py
+++ b/mood.py
@@ -1,8 +1,8 @@
 try:
-    from PyQt6 import QtCore, QtGui, QtWidgets
+    from PyQt6 import QtCore, QtWidgets
 except ImportError:
     print("PyQt5 fallback (mood.py)")
-    from PyQt5 import QtCore, QtGui, QtWidgets
+    from PyQt5 import QtCore, QtWidgets
 
 from generic import PesterIcon
 
diff --git a/parsetools.py b/parsetools.py
index 59617f6..1538e91 100644
--- a/parsetools.py
+++ b/parsetools.py
@@ -11,7 +11,6 @@ except ImportError:
     from PyQt5 import QtGui, QtWidgets
 
 import dataobjs
-import ostools
 
 # karxi: My own contribution to this - a proper lexer.
 import pnc.lexercon as lexercon
diff --git a/pesterchum.py b/pesterchum.py
index 52deef9..99f34b1 100755
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -60,11 +60,11 @@ from toast import PesterToastMachine, PesterToast
 
 try:
     from PyQt6 import QtCore, QtGui, QtWidgets
-    from PyQt6.QtGui import QShortcut, QAction, QActionGroup
+    from PyQt6.QtGui import QAction, QActionGroup
 except ImportError:
     print("PyQt5 fallback (pesterchum.py)")
     from PyQt5 import QtCore, QtGui, QtWidgets
-    from PyQt5.QtWidgets import QAction, QShortcut, QActionGroup
+    from PyQt5.QtWidgets import QAction, QActionGroup
 
 # Data directory
 ostools.validateDataDir()
diff --git a/pyquirks.py b/pyquirks.py
index 487e121..971695b 100644
--- a/pyquirks.py
+++ b/pyquirks.py
@@ -7,7 +7,6 @@ except ImportError:
     print("PyQt5 fallback (pyquirks.py)")
     from PyQt5 import QtWidgets
 
-import ostools
 from quirks import ScriptQuirks
 
 PchumLog = logging.getLogger("pchumLogger")
diff --git a/randomer.py b/randomer.py
index 1352c26..3a2fef6 100644
--- a/randomer.py
+++ b/randomer.py
@@ -6,7 +6,6 @@ except ImportError:
     print("PyQt5 fallback (randomer.py)")
     from PyQt5 import QtCore, QtWidgets
 
-import ostools
 
 PchumLog = logging.getLogger("pchumLogger")
 
diff --git a/setup.py b/setup.py
index 077ec0f..5037d6b 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,6 @@
 import sys
 
 from cx_Freeze import setup, Executable
-import pygame
 
 from version import buildVersion