[IMP] Moved ups_request.py file from models to root folder of the module.

Author: sudhir-erpharbor

delivery_ups_oca/__init__.py

@@ -1,3 +1,4 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from . import models
+from . import ups_request

delivery_ups_oca/models/__init__.py

@@ -2,6 +2,5 @@
 from . import delivery_carrier
 from . import stock_package_type
 from . import stock_picking
-from . import ups_request
 from . import ups_paperless_document
 from . import res_partner

delivery_ups_oca/models/delivery_carrier.py

@@ -13,7 +13,7 @@
 from odoo import _, fields, models
 from odoo.exceptions import UserError
 
-from .ups_request import UpsRequest
+from ..ups_request import UpsRequest
 
 
 class DeliveryCarrier(models.Model):
@@ -204,12 +204,12 @@ def _create_ups_label(self, picking, labels):
             format_code = label["format_code"].upper()
             label_data = label["datas"]
             file_extension = format_code
-            
+
             # Convert GIF to PDF only when PDF format is explicitly selected
             if self.ups_file_format == "PDF" and format_code == "GIF":
                 label_data = self._convert_gif_to_pdf(label_data)
                 file_extension = "PDF"
-            
+
             attachment_name = "label-%s.%s" % (
                 label["tracking_ref"],
                 file_extension.lower(),
@@ -224,7 +224,7 @@ def _create_ups_label(self, picking, labels):
                 )
             )
         attachments = self.env["ir.attachment"].create(val_list)
-        
+
         # Post attachments to picking's message thread as internal note
         # (doesn't notify followers)
         if attachments:
@@ -233,7 +233,7 @@ def _create_ups_label(self, picking, labels):
                 attachment_ids=attachments.ids,
                 subtype_xmlid='mail.mt_note',
             )
-        
+
         return attachments
 
     def ups_get_label(self, carrier_tracking_ref):

delivery_ups_oca/tests/test_delivery_ups.py

@@ -7,10 +7,10 @@
 from unittest import mock
 
 from odoo.tests import Form, common
-from ..models.ups_request import UpsRequest
+from ..ups_request import UpsRequest
 
 _module_ns = "odoo.addons.delivery_ups_oca"
-_provider_class = _module_ns + ".models.ups_request.UpsRequest"
+_provider_class = _module_ns + ".ups_request.UpsRequest"
 
 
 class TestDeliveryUpsBase(common.TransactionCase):

delivery_ups_oca/tests/test_negotiated_rates.py

@@ -6,7 +6,7 @@
 from .test_delivery_ups import TestDeliveryUpsBase
 
 _module_ns = "odoo.addons.delivery_ups_oca"
-_provider_class = _module_ns + ".models.ups_request.UpsRequest"
+_provider_class = _module_ns + ".ups_request.UpsRequest"
 
 
 class TestUpsNegotiatedRates(TestDeliveryUpsBase):

delivery_ups_oca/tests/test_residential_address.py

@@ -5,10 +5,10 @@
 
 from odoo.tests import Form, common
 from .test_ups_insurance import TestDeliveryUpsInsurance
-from ..models.ups_request import UpsRequest
+from ..ups_request import UpsRequest
 
 _module_ns = "odoo.addons.delivery_ups_oca"
-_provider_class = _module_ns + ".models.ups_request.UpsRequest"
+_provider_class = _module_ns + ".ups_request.UpsRequest"
 
 
 class TestResidentialAddress(TestDeliveryUpsInsurance):

delivery_ups_oca/tests/test_send_paperless_invoice.py

@@ -6,7 +6,7 @@
 
 
 _module_ns = "odoo.addons.delivery_ups_oca"
-_provider_class = _module_ns + ".models.ups_request.UpsRequest"
+_provider_class = _module_ns + ".ups_request.UpsRequest"
 
 
 class TestSendPaperlessInvoice(TransactionCase):

delivery_ups_oca/tests/test_ups_insurance.py

@@ -4,10 +4,10 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.tests import Form, common
-from ..models.ups_request import UpsRequest
+from ..ups_request import UpsRequest
 
 _module_ns = "odoo.addons.delivery_ups_oca"
-_provider_class = _module_ns + ".models.ups_request.UpsRequest"
+_provider_class = _module_ns + ".ups_request.UpsRequest"
 
 
 class TestDeliveryUpsInsurance(common.TransactionCase):

delivery_ups_oca/models/ups_request.py renamed to delivery_ups_oca/ups_request.py

@@ -16,7 +16,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class UpsRequest(object):
+class UpsRequest():
     def __init__(self, carrier):
         self.carrier = carrier
         self.default_packaging_id = self.carrier.ups_default_packaging_id