From 519ed0a5945941ef29bd1d52aaa6105b72363b14 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 5 May 2023 01:48:39 -0500 Subject: [PATCH] Avoid deprecated import for `OrderedDict` --- rattail_corepos/corepos/importing/db/corepos.py | 5 +++-- .../corepos/importing/db/exporters/catapult_inventory.py | 4 ++-- .../corepos/importing/db/exporters/catapult_membership.py | 4 ++-- rattail_corepos/corepos/importing/db/square.py | 4 ++-- rattail_corepos/corepos/importing/rattail.py | 5 +++-- rattail_corepos/corepos/lane/importing/op/office.py | 5 +++-- rattail_corepos/corepos/util.py | 5 ++--- rattail_corepos/importing/corepos/api.py | 4 ++-- rattail_corepos/importing/corepos/db.py | 4 ++-- rattail_corepos/trainwreck/importing/corepos.py | 5 +++-- 10 files changed, 24 insertions(+), 21 deletions(-) diff --git a/rattail_corepos/corepos/importing/db/corepos.py b/rattail_corepos/corepos/importing/db/corepos.py index 8c024bc..d786f43 100644 --- a/rattail_corepos/corepos/importing/db/corepos.py +++ b/rattail_corepos/corepos/importing/db/corepos.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2021 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -24,11 +24,12 @@ CORE-POS -> CORE-POS data import """ +from collections import OrderedDict + from corepos.db.office_op import Session as CoreSession from rattail.importing.handlers import FromSQLAlchemyHandler, ToSQLAlchemyHandler from rattail.importing.sqlalchemy import FromSQLAlchemySameToSame -from rattail.util import OrderedDict from rattail_corepos.corepos.importing import db as corepos_importing diff --git a/rattail_corepos/corepos/importing/db/exporters/catapult_inventory.py b/rattail_corepos/corepos/importing/db/exporters/catapult_inventory.py index aa884d8..153073d 100644 --- a/rattail_corepos/corepos/importing/db/exporters/catapult_inventory.py +++ b/rattail_corepos/corepos/importing/db/exporters/catapult_inventory.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2020 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -28,6 +28,7 @@ import re import datetime import decimal import logging +from collections import OrderedDict from sqlalchemy.exc import ProgrammingError from sqlalchemy import orm @@ -39,7 +40,6 @@ from corepos.db.util import table_exists from rattail.gpc import GPC from rattail.core import get_uuid -from rattail.util import OrderedDict from rattail.importing.handlers import ToFileHandler from rattail_corepos.corepos.importing.db.corepos import FromCoreHandler, FromCore from rattail_onager.catapult.importing import inventory as catapult_importing diff --git a/rattail_corepos/corepos/importing/db/exporters/catapult_membership.py b/rattail_corepos/corepos/importing/db/exporters/catapult_membership.py index d54bb1f..153cb69 100644 --- a/rattail_corepos/corepos/importing/db/exporters/catapult_membership.py +++ b/rattail_corepos/corepos/importing/db/exporters/catapult_membership.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2020 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -26,12 +26,12 @@ CORE-POS -> Catapult Membership Workbook import decimal import logging +from collections import OrderedDict from sqlalchemy import orm from corepos.db.office_op import model as corepos -from rattail.util import OrderedDict from rattail.importing.handlers import ToFileHandler from rattail.time import localtime from rattail.excel import ExcelReader diff --git a/rattail_corepos/corepos/importing/db/square.py b/rattail_corepos/corepos/importing/db/square.py index 439978a..43c80fb 100644 --- a/rattail_corepos/corepos/importing/db/square.py +++ b/rattail_corepos/corepos/importing/db/square.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2020 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -27,13 +27,13 @@ Square -> CORE-POS data importing import re import datetime import decimal +from collections import OrderedDict import sqlalchemy as sa from corepos.db.office_trans import Session as CoreTransSession, model as coretrans from rattail import importing -from rattail.util import OrderedDict from rattail_corepos.corepos.importing import db as corepos_importing diff --git a/rattail_corepos/corepos/importing/rattail.py b/rattail_corepos/corepos/importing/rattail.py index 272f8d6..44d5de8 100644 --- a/rattail_corepos/corepos/importing/rattail.py +++ b/rattail_corepos/corepos/importing/rattail.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2022 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -25,12 +25,13 @@ Rattail -> CORE-POS data export """ import logging +from collections import OrderedDict from sqlalchemy import orm from rattail import importing 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.util import get_max_existing_vendor_id diff --git a/rattail_corepos/corepos/lane/importing/op/office.py b/rattail_corepos/corepos/lane/importing/op/office.py index ce3fd1c..572cee3 100644 --- a/rattail_corepos/corepos/lane/importing/op/office.py +++ b/rattail_corepos/corepos/lane/importing/op/office.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2021 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -24,12 +24,13 @@ CORE Office -> CORE Lane import """ +from collections import OrderedDict + from corepos.db.office_op import Session as CoreOfficeSession, model as coreoffice from corepos.db.lane_op import Session as CoreLaneSession from rattail import importing from rattail.importing.handlers import FromSQLAlchemyHandler, ToSQLAlchemyHandler -from rattail.util import OrderedDict from rattail_corepos.corepos.lane.importing import op as corepos_importing diff --git a/rattail_corepos/corepos/util.py b/rattail_corepos/corepos/util.py index 06b01fa..6885066 100644 --- a/rattail_corepos/corepos/util.py +++ b/rattail_corepos/corepos/util.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2022 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -25,13 +25,12 @@ CORE-POS misc. utilities """ import logging +from collections import OrderedDict import sqlalchemy as sa from corepos.db.office_op import Session as CoreSession, model as corepos -from rattail.util import OrderedDict - log = logging.getLogger(__name__) diff --git a/rattail_corepos/importing/corepos/api.py b/rattail_corepos/importing/corepos/api.py index cec8493..2fb2c32 100644 --- a/rattail_corepos/importing/corepos/api.py +++ b/rattail_corepos/importing/corepos/api.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2022 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -27,12 +27,12 @@ CORE POS (API) -> Rattail data importing import datetime import decimal import logging +from collections import OrderedDict from sqlalchemy import orm from rattail import importing from rattail.gpc import GPC -from rattail.util import OrderedDict from rattail.time import localtime, make_utc from rattail.core import get_uuid from rattail.db.util import normalize_full_name diff --git a/rattail_corepos/importing/corepos/db.py b/rattail_corepos/importing/corepos/db.py index b5b25e8..d20bc02 100644 --- a/rattail_corepos/importing/corepos/db.py +++ b/rattail_corepos/importing/corepos/db.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2021 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -25,12 +25,12 @@ CORE POS (DB) -> Rattail data importing """ import decimal +from collections import OrderedDict from corepos.db.office_op import model as corepos, Session as CoreSession from rattail import importing from rattail.gpc import GPC -from rattail.util import OrderedDict from rattail_corepos import importing as corepos_importing diff --git a/rattail_corepos/trainwreck/importing/corepos.py b/rattail_corepos/trainwreck/importing/corepos.py index 41522b1..ea80bac 100644 --- a/rattail_corepos/trainwreck/importing/corepos.py +++ b/rattail_corepos/trainwreck/importing/corepos.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2021 Lance Edgar +# Copyright © 2010-2023 Lance Edgar # # This file is part of Rattail. # @@ -24,11 +24,12 @@ 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_op import Session as CoreSession, model as corepos from rattail import importing -from rattail.util import OrderedDict from rattail.time import localtime, make_utc from rattail.trainwreck import importing as trainwreck_importing