move files into a package structure

bigtext.py

@@ -13,7 +13,7 @@ from PySide6.QtWidgets import *
 
 import constants
 from raven.ui.ScaledScrollBar import ScaledScrollBar
-from conversion import humanbytes
+from raven.util.conversion import humanbytes
 from highlight_selection import HighlightSelection
 from highlighted_range import HighlightedRange
 from highlightingdialog import HighlightingDialog
@@ -21,7 +21,7 @@ from line import Line
 from logFileModel import LogFileModel
 from raven.pluginregistry import PluginRegistry
 
-from settings import Settings
+from raven.settings.settings import Settings
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 from raven.i18n import _

fulltabwidget.py

@@ -6,7 +6,7 @@ from filterviewsyncer import FilterViewSyncer
 from filterwidget import FilterWidget
 from logFileModel import LogFileModel
 from raven.plugins.ravenlog.Tab import Tab
-from conversion import humanbytes
+from raven.util.conversion import humanbytes
 
 
 class FullTabWidget(Tab):

highlight_selection.py

@@ -6,7 +6,7 @@ from line import Line
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QBrush, QColor
 
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class HighlightSelection(Highlight):

highlighting.py

@@ -1,7 +1,7 @@
 import logging
 
 from highlight_regex import HighlightRegex
-from settings import Settings
+from raven.settings.settings import Settings
 
 log = logging.getLogger("highlighting")
 

highlightingdialog.py

@@ -6,7 +6,7 @@ from raven.ui.colorbutton import ColorButton
 from raven.ui.hbox import HBox
 from highlight_regex import HighlightRegex
 from highlighting import Highlighting
-from settings import Settings
+from raven.settings.settings import Settings
 
 from raven.i18n import _
 

linetolinemap.py

@@ -2,7 +2,7 @@ import os
 import tempfile
 from typing import Optional
 
-from int2intmap import Int2IntMap
+from raven.util.int2intmap import Int2IntMap
 
 
 class LineToLineMap:

logFileModel.py

@@ -6,7 +6,7 @@ from highlight_regex import HighlightRegex
 from highlighting import Highlighting
 from line import Line
 import os
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class LogFileModel:

raven/i18n.py

@@ -3,7 +3,7 @@ import os
 from pathlib import Path
 
 from raven.pluginregistry import PluginRegistry
-from settingsstore import SettingsStore
+from raven.settings.settingsstore import SettingsStore
 
 settings = SettingsStore.load()
 locale = os.environ['LANG'] if os.environ['LANG'] else "en"

raven/mainwindow.py

@@ -5,16 +5,16 @@ from PySide6.QtWidgets import *
 from PySide6.QtGui import *
 from PySide6.QtCore import Qt
 
-import urlutils
-from cutesettings import CuteSettings
+from raven.util import urlutils
+from raven.settings.cutesettings import CuteSettings
 from raven.pluginregistry import PluginRegistry
 from raven.plugins.domain.menucontribution import MenuContribution, sort_menu_contributions
 from raven.plugins.domain.raction import RAction
 from raven.plugins.domain.rmenu import RMenu
-from settingsstore import SettingsStore
+from raven.settings.settingsstore import SettingsStore
 from highlightingdialog import HighlightingDialog
 from raven.ui.tabs import Tabs
-from urlutils import url_is_file
+from raven.util.urlutils import url_is_file
 from functools import reduce
 
 from raven.i18n import _

raven/plugins/logfileplugin.py

@@ -1,5 +1,5 @@
 import os.path
-from typing import Callable, Optional
+from typing import Optional
 
 from PySide6.QtWidgets import QMessageBox
 
@@ -7,7 +7,7 @@ from fulltabwidget import FullTabWidget
 from logFileModel import LogFileModel
 from raven.pluginbase import PluginBase
 from raven.plugins.ravenlog.Tab import Tab
-from settings import Settings
+from raven.settings.settings import Settings
 
 from raven.i18n import _
 

raven/plugins/openfileplugin.py

@@ -1,8 +1,6 @@
 import os
-from typing import Callable
 from pathlib import Path
 
-from PySide6.QtCore import QObject
 from PySide6.QtWidgets import QFileDialog
 
 from raven.pluginbase import PluginBase
@@ -10,7 +8,7 @@ from raven.pluginregistry import PluginRegistry
 from raven.plugins.domain.menucontribution import MenuContribution
 from raven.plugins.domain.raction import RAction
 from raven.plugins.domain.rmenu import RMenu
-from settings import Settings
+from raven.settings.settings import Settings
 
 from raven.i18n import _
 

raven/plugins/ravenlogplugin.py

@@ -13,7 +13,7 @@ from raven.plugins.domain.raction import RAction
 from raven.plugins.domain.rmenu import RMenu
 from raven.plugins.ravenlog.Tab import Tab
 from raven.i18n import _, locale
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class RavenLogPlugin(PluginBase):

raven/settings/settingsstore.py

@@ -1,12 +1,11 @@
 import os
 import sys
-from typing import Callable
-
-from settings import Settings
 from pathlib import Path
-from os.path import join, isfile
+from os.path import join
 from configparser import ConfigParser
 
+from raven.settings.settings import Settings
+
 
 class SettingsStore():
     def __init__(self):

raven/ui/tabs.py

@@ -4,7 +4,7 @@ from PySide6.QtWidgets import QWidget, QTabWidget, QVBoxLayout
 
 from raven.pluginregistry import PluginRegistry
 from raven.plugins.ravenlog.Tab import Tab
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class Tabs(QWidget):

raven/util/testint2intmaplike.py

@@ -2,7 +2,7 @@ import tempfile
 import unittest
 from os.path import join
 
-from int2intmap import Int2IntMap
+from raven.util.int2intmap import Int2IntMap
 
 
 class Int2IntMapLike(unittest.TestCase):

testlogfilemodel.py

@@ -4,7 +4,7 @@ from configparser import ConfigParser
 from os.path import join
 
 from logFileModel import LogFileModel
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class TestLogFileModel(unittest.TestCase):