rattail/rattail-corepos
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Avoid deprecated import for OrderedDict

Browse source
This commit is contained in:
Lance Edgar 2023-05-05 01:48:39 -05:00
parent 20a587ccdd
commit 519ed0a594
10 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rattail_corepos/corepos/importing/db/corepos.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2021 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,11 +24,12 @@
CORE-POS -> CORE-POS data import CORE-POS -> CORE-POS data import
""" """
from collections import OrderedDict
from corepos.db.office_op import Session as CoreSession from corepos.db.office_op import Session as CoreSession
from rattail.importing.handlers import FromSQLAlchemyHandler, ToSQLAlchemyHandler from rattail.importing.handlers import FromSQLAlchemyHandler, ToSQLAlchemyHandler
from rattail.importing.sqlalchemy import FromSQLAlchemySameToSame from rattail.importing.sqlalchemy import FromSQLAlchemySameToSame
from rattail.util import OrderedDict
from rattail_corepos.corepos.importing import db as corepos_importing from rattail_corepos.corepos.importing import db as corepos_importing

4
rattail_corepos/corepos/importing/db/exporters/catapult_inventory.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2020 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -28,6 +28,7 @@ import re
import datetime import datetime
import decimal import decimal
import logging import logging
from collections import OrderedDict
from sqlalchemy.exc import ProgrammingError from sqlalchemy.exc import ProgrammingError
from sqlalchemy import orm from sqlalchemy import orm
@ -39,7 +40,6 @@ from corepos.db.util import table_exists
from rattail.gpc import GPC from rattail.gpc import GPC
from rattail.core import get_uuid from rattail.core import get_uuid
from rattail.util import OrderedDict
from rattail.importing.handlers import ToFileHandler from rattail.importing.handlers import ToFileHandler
from rattail_corepos.corepos.importing.db.corepos import FromCoreHandler, FromCore from rattail_corepos.corepos.importing.db.corepos import FromCoreHandler, FromCore
from rattail_onager.catapult.importing import inventory as catapult_importing from rattail_onager.catapult.importing import inventory as catapult_importing

4
rattail_corepos/corepos/importing/db/exporters/catapult_membership.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2020 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -26,12 +26,12 @@ CORE-POS -> Catapult Membership Workbook
import decimal import decimal
import logging import logging
from collections import OrderedDict
from sqlalchemy import orm from sqlalchemy import orm
from corepos.db.office_op import model as corepos from corepos.db.office_op import model as corepos
from rattail.util import OrderedDict
from rattail.importing.handlers import ToFileHandler from rattail.importing.handlers import ToFileHandler
from rattail.time import localtime from rattail.time import localtime
from rattail.excel import ExcelReader from rattail.excel import ExcelReader

4
rattail_corepos/corepos/importing/db/square.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2020 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -27,13 +27,13 @@ Square -> CORE-POS data importing
import re import re
import datetime import datetime
import decimal import decimal
from collections import OrderedDict
import sqlalchemy as sa import sqlalchemy as sa
from corepos.db.office_trans import Session as CoreTransSession, model as coretrans from corepos.db.office_trans import Session as CoreTransSession, model as coretrans
from rattail import importing from rattail import importing
from rattail.util import OrderedDict
from rattail_corepos.corepos.importing import db as corepos_importing from rattail_corepos.corepos.importing import db as corepos_importing

5
rattail_corepos/corepos/importing/rattail.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2022 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -25,12 +25,13 @@ Rattail -> CORE-POS data export
""" """
import logging import logging
from collections import OrderedDict
from sqlalchemy import orm from sqlalchemy import orm
from rattail import importing from rattail import importing
from rattail.db import model from rattail.db import model
from rattail.util import OrderedDict, pretty_quantity from rattail.util import pretty_quantity
from rattail_corepos.corepos import importing as corepos_importing from rattail_corepos.corepos import importing as corepos_importing
from rattail_corepos.corepos.util import get_max_existing_vendor_id from rattail_corepos.corepos.util import get_max_existing_vendor_id

5
rattail_corepos/corepos/lane/importing/op/office.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2021 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,12 +24,13 @@
CORE Office -> CORE Lane import CORE Office -> CORE Lane import
""" """
from collections import OrderedDict
from corepos.db.office_op import Session as CoreOfficeSession, model as coreoffice from corepos.db.office_op import Session as CoreOfficeSession, model as coreoffice
from corepos.db.lane_op import Session as CoreLaneSession from corepos.db.lane_op import Session as CoreLaneSession
from rattail import importing from rattail import importing
from rattail.importing.handlers import FromSQLAlchemyHandler, ToSQLAlchemyHandler from rattail.importing.handlers import FromSQLAlchemyHandler, ToSQLAlchemyHandler
from rattail.util import OrderedDict
from rattail_corepos.corepos.lane.importing import op as corepos_importing from rattail_corepos.corepos.lane.importing import op as corepos_importing

5
rattail_corepos/corepos/util.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2022 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -25,13 +25,12 @@ CORE-POS misc. utilities
""" """
import logging import logging
from collections import OrderedDict
import sqlalchemy as sa import sqlalchemy as sa
from corepos.db.office_op import Session as CoreSession, model as corepos from corepos.db.office_op import Session as CoreSession, model as corepos
from rattail.util import OrderedDict
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

4
rattail_corepos/importing/corepos/api.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2022 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -27,12 +27,12 @@ CORE POS (API) -> Rattail data importing
import datetime import datetime
import decimal import decimal
import logging import logging
from collections import OrderedDict
from sqlalchemy import orm from sqlalchemy import orm
from rattail import importing from rattail import importing
from rattail.gpc import GPC from rattail.gpc import GPC
from rattail.util import OrderedDict
from rattail.time import localtime, make_utc from rattail.time import localtime, make_utc
from rattail.core import get_uuid from rattail.core import get_uuid
from rattail.db.util import normalize_full_name from rattail.db.util import normalize_full_name

4
rattail_corepos/importing/corepos/db.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2021 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -25,12 +25,12 @@ CORE POS (DB) -> Rattail data importing
""" """
import decimal import decimal
from collections import OrderedDict
from corepos.db.office_op import model as corepos, Session as CoreSession from corepos.db.office_op import model as corepos, Session as CoreSession
from rattail import importing from rattail import importing
from rattail.gpc import GPC from rattail.gpc import GPC
from rattail.util import OrderedDict
from rattail_corepos import importing as corepos_importing from rattail_corepos import importing as corepos_importing

5
rattail_corepos/trainwreck/importing/corepos.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2021 Lance Edgar # Copyright © 2010-2023 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,11 +24,12 @@
CORE-POS -> Trainwreck data importing CORE-POS -> Trainwreck data importing
""" """
from collections import OrderedDict
from corepos.db.office_trans import Session as CoreTransSession, model as coretrans from corepos.db.office_trans import Session as CoreTransSession, model as coretrans
from corepos.db.office_op import Session as CoreSession, model as corepos from corepos.db.office_op import Session as CoreSession, model as corepos
from rattail import importing from rattail import importing
from rattail.util import OrderedDict
from rattail.time import localtime, make_utc from rattail.time import localtime, make_utc
from rattail.trainwreck import importing as trainwreck_importing from rattail.trainwreck import importing as trainwreck_importing