From 40013c82b21f551011e430224786466a66817b69 Mon Sep 17 00:00:00 2001 From: Randall Nagy Date: Thu, 19 Sep 2024 08:28:43 -0400 Subject: [PATCH] Module Fix'n --- SqltDAO/CodeGen01/OrderClass.py | 2 +- SqltDAO/DaoTest01/GenNasdaq.py | 2 +- SqltDAO/DaoTest01/tc001_gen.py | 2 +- SqltDAO/SchemaDef/Factory.py | 6 +++--- SqltDAO/main.py | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SqltDAO/CodeGen01/OrderClass.py b/SqltDAO/CodeGen01/OrderClass.py index 8cd00e8..3083957 100644 --- a/SqltDAO/CodeGen01/OrderClass.py +++ b/SqltDAO/CodeGen01/OrderClass.py @@ -6,7 +6,7 @@ sys.path.insert(1, os.path.join(sys.path[0], '../..')) from collections import OrderedDict -from SqltDAO.Gui.DataPreferences import Dp1 as DataPreferences, Preferences +from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences, Preferences from SqltDAO.CodeGen01.Normalizers import Norm class OrderClass: diff --git a/SqltDAO/DaoTest01/GenNasdaq.py b/SqltDAO/DaoTest01/GenNasdaq.py index 83eb90d..994514c 100644 --- a/SqltDAO/DaoTest01/GenNasdaq.py +++ b/SqltDAO/DaoTest01/GenNasdaq.py @@ -5,7 +5,7 @@ from SqltDAO.CodeGen01.OrderClass import OrderClass from SqltDAO.SchemaDef.OrderDef import OrderDef1 as OrderDef from SqltDAO.CodeGen01.CodeGen import DaoGen -from SqltDAO.Gui.DataPreferences import Dp1 as DataPreferences +from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences if __name__ == "__main__": data_file = "../DaoTest01/nasdaqlisted.txt" diff --git a/SqltDAO/DaoTest01/tc001_gen.py b/SqltDAO/DaoTest01/tc001_gen.py index b675015..bf9e193 100644 --- a/SqltDAO/DaoTest01/tc001_gen.py +++ b/SqltDAO/DaoTest01/tc001_gen.py @@ -4,7 +4,7 @@ from SqltDAO.CodeGen01.OrderClass import OrderClass from SqltDAO.CodeGen01.CodeGen import DaoGen -from SqltDAO.Gui.DataPreferences import Dp1 as DataPreferences +from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences test = DaoGen() diff --git a/SqltDAO/SchemaDef/Factory.py b/SqltDAO/SchemaDef/Factory.py index 2b55d86..73a146b 100644 --- a/SqltDAO/SchemaDef/Factory.py +++ b/SqltDAO/SchemaDef/Factory.py @@ -68,7 +68,7 @@ def Create(order_class, detect): @staticmethod def Extract(order_def, pref): - from SqltDAO.Gui.DataPreferences import Preferences + from SqltDAO.GenGui.DataPreferences import Preferences ''' Extract an OrderClass from an OrderDef. Raise an exception on error.''' if isinstance(order_def, OrderDef) is False: raise TypeError("Error: Instance of OrderClass is required.") @@ -128,7 +128,7 @@ def SaveFile(pref, order_def, overwrite=False): ''' Will always STORE an instance into a project_name, if accessable. True / False returned. ''' - from SqltDAO.Gui.DataPreferences import Preferences + from SqltDAO.GenGui.DataPreferences import Preferences if not isinstance(order_def, OrderDef): return False if isinstance(pref, Preferences) is False: @@ -191,7 +191,7 @@ def SaveAs(fq_file, order_def, overwrite=False): detect = Factory1.Detect(file) print(detect.__dict__) else: - from SqltDAO.Gui.DataPreferences import Dp1 as DataPreferences + from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences pref = DataPreferences.Load('.') zorder = OrderDef(name=OrderDef.DEFAULT_SCHEMA) zname = zorder.project_name diff --git a/SqltDAO/main.py b/SqltDAO/main.py index 59b2c75..b363027 100644 --- a/SqltDAO/main.py +++ b/SqltDAO/main.py @@ -20,11 +20,11 @@ from SqltDAO.SchemaDef.OrderDef import OrderDef1 as OrderDef from SqltDAO.SchemaDef.Factory import Factory1 -from SqltDAO.Gui.Data2Code import Data2Code -from SqltDAO.Gui.StandardEntry import LabelEntry -from SqltDAO.Gui.TableDef import TableDef as TableDef2 +from SqltDAO.GenGui.Data2Code import Data2Code +from SqltDAO.GenGui.StandardEntry import LabelEntry +from SqltDAO.GenGui.TableDef import TableDef as TableDef2 from SqltDAO.SchemaDef.Table import TableDef as TableDef1 -from SqltDAO.Gui.DataPreferences import Dp1 as DataPreferences +from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences class Main(Tk):