Skip to content

Commit

Permalink
Module Fix'n
Browse files Browse the repository at this point in the history
  • Loading branch information
Randall Nagy committed Sep 19, 2024
1 parent 40013c8 commit 679290d
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion SqltDAO/CodeGen01/OrderClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
sys.path.insert(1, os.path.join(sys.path[0], '../..'))

from collections import OrderedDict
from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences, Preferences
from SqltDAO.GenGUI.DataPreferences import Dp1 as DataPreferences, Preferences
from SqltDAO.CodeGen01.Normalizers import Norm

class OrderClass:
Expand Down
2 changes: 1 addition & 1 deletion SqltDAO/DaoTest01/GenNasdaq.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.GenGui.DataPreferences import Dp1 as DataPreferences
from SqltDAO.GenGUI.DataPreferences import Dp1 as DataPreferences

if __name__ == "__main__":
data_file = "../DaoTest01/nasdaqlisted.txt"
Expand Down
2 changes: 1 addition & 1 deletion SqltDAO/DaoTest01/tc001_gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from SqltDAO.CodeGen01.OrderClass import OrderClass
from SqltDAO.CodeGen01.CodeGen import DaoGen
from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences
from SqltDAO.GenGUI.DataPreferences import Dp1 as DataPreferences

test = DaoGen()

Expand Down
2 changes: 1 addition & 1 deletion SqltDAO/GenGUI/Data2Code.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from SqltDAO.SchemaDef.OrderDef import OrderDef1 as OrderDef
from SqltDAO.CodeGen01.SqlSyntax import SqliteCrud
from SqltDAO.CodeGen01.CodeGen import DaoGen
from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences
from SqltDAO.GenGUI.DataPreferences import Dp1 as DataPreferences

from collections import OrderedDict

Expand Down
2 changes: 1 addition & 1 deletion SqltDAO/GenGUI/DataAI.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from SqltDAO.SchemaDef.OrderDef import OrderDef1 as OrderDef
from SqltDAO.CodeGen01.SqlSyntax import SqliteCrud
from SqltDAO.CodeGen01.CodeGen import DaoGen
from SqltDAO.GenGui.DataPreferences import Dp1 as DataPreferences
from SqltDAO.GenGUI.DataPreferences import Dp1 as DataPreferences
from SqltDAO.SchemaDef.Factory import Factory1

from collections import OrderedDict
Expand Down
2 changes: 1 addition & 1 deletion SqltDAO/GenGUI/DataPreferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from collections import OrderedDict

from SqltDAO.GenGui.StandardEntry import LabelEntryAction
from SqltDAO.GenGUI.StandardEntry import LabelEntryAction

class Preferences:
''' Opportunity to create an official class to manage those
Expand Down
2 changes: 1 addition & 1 deletion SqltDAO/GenGUI/TableDef.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from tkinter import *
from tkinter import messagebox

from SqltDAO.GenGui.StandardEntry import LabelEntry
from SqltDAO.GenGUI.StandardEntry import LabelEntry
from SqltDAO.SchemaDef.Table import TableDef as TableDef1

from collections import OrderedDict
Expand Down
6 changes: 3 additions & 3 deletions SqltDAO/SchemaDef/Factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def Create(order_class, detect):

@staticmethod
def Extract(order_def, pref):
from SqltDAO.GenGui.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.")
Expand Down Expand Up @@ -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.GenGui.DataPreferences import Preferences
from SqltDAO.GenGUI.DataPreferences import Preferences
if not isinstance(order_def, OrderDef):
return False
if isinstance(pref, Preferences) is False:
Expand Down Expand Up @@ -191,7 +191,7 @@ def SaveAs(fq_file, order_def, overwrite=False):
detect = Factory1.Detect(file)
print(detect.__dict__)
else:
from SqltDAO.GenGui.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
Expand Down
8 changes: 4 additions & 4 deletions SqltDAO/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
from SqltDAO.SchemaDef.OrderDef import OrderDef1 as OrderDef
from SqltDAO.SchemaDef.Factory import Factory1

from SqltDAO.GenGui.Data2Code import Data2Code
from SqltDAO.GenGui.StandardEntry import LabelEntry
from SqltDAO.GenGui.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.GenGui.DataPreferences import Dp1 as DataPreferences
from SqltDAO.GenGUI.DataPreferences import Dp1 as DataPreferences

class Main(Tk):

Expand Down

0 comments on commit 679290d

Please sign in to comment.