From eb5027e384f284a994534eefdc0f3857e175dcd3 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 5 May 2023 02:02:17 -0500 Subject: [PATCH] Avoid deprecated import for `OrderedDict` --- tailbone_corepos/views/corepos/groups.py | 6 +++--- tailbone_corepos/views/corepos/master.py | 5 +++-- tailbone_corepos/views/corepos/transactions/archive.py | 6 +++--- tailbone_corepos/views/corepos/transactions/current.py | 5 +++-- tailbone_corepos/views/people.py | 5 +++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tailbone_corepos/views/corepos/groups.py b/tailbone_corepos/views/corepos/groups.py index 1609c9a..3648dbb 100644 --- a/tailbone_corepos/views/corepos/groups.py +++ b/tailbone_corepos/views/corepos/groups.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. # @@ -24,9 +24,9 @@ CORE-POS group views """ -from corepos.db.office_op import model as corepos +from collections import OrderedDict -from rattail.util import OrderedDict +from corepos.db.office_op import model as corepos from webhelpers2.html import HTML diff --git a/tailbone_corepos/views/corepos/master.py b/tailbone_corepos/views/corepos/master.py index 462e36e..48f00c0 100644 --- a/tailbone_corepos/views/corepos/master.py +++ b/tailbone_corepos/views/corepos/master.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. # @@ -24,7 +24,8 @@ CORE POS master view """ -from rattail.util import OrderedDict +from collections import OrderedDict + from rattail.time import localtime from rattail_corepos.config import core_office_url diff --git a/tailbone_corepos/views/corepos/transactions/archive.py b/tailbone_corepos/views/corepos/transactions/archive.py index 522fb91..a5a8b49 100644 --- a/tailbone_corepos/views/corepos/transactions/archive.py +++ b/tailbone_corepos/views/corepos/transactions/archive.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. # @@ -24,9 +24,9 @@ CORE-POS "archive" transaction views """ -from corepos.db.office_trans_archive import model as corearch +from collections import OrderedDict -from rattail.util import OrderedDict +from corepos.db.office_trans_archive import model as corearch from .base import TransactionDetailMasterView from tailbone_corepos.db import CoreTransArchiveSession, ExtraCoreTransArchiveSessions diff --git a/tailbone_corepos/views/corepos/transactions/current.py b/tailbone_corepos/views/corepos/transactions/current.py index 6c38f15..49e5afc 100644 --- a/tailbone_corepos/views/corepos/transactions/current.py +++ b/tailbone_corepos/views/corepos/transactions/current.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. # @@ -24,9 +24,10 @@ CORE-POS transaction views """ +from collections import OrderedDict + from corepos.db.office_trans import model as coretrans -from rattail.util import OrderedDict from rattail_corepos.corepos.importing.db.square import FromSquareToCoreTrans from .base import TransactionDetailMasterView diff --git a/tailbone_corepos/views/people.py b/tailbone_corepos/views/people.py index 1768298..9cd6705 100644 --- a/tailbone_corepos/views/people.py +++ b/tailbone_corepos/views/people.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. # @@ -24,8 +24,9 @@ Person views """ +from collections import OrderedDict + from rattail_corepos.config import core_office_customer_account_url -from rattail.util import OrderedDict from tailbone.views import ViewSupplement