Avoid deprecated import for OrderedDict

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
 
 

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

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

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
 
 

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
 

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
 
 

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__)
 

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

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
 
 

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