Merge pull request #314 from ej2/0.9.4

0.9.4 Release

CHANGELOG.rst

@@ -1,5 +1,11 @@
 Changelog
 =========
+* 0.9.4 (August 29, 2023)
+    * Removed python 2 compatible decorators
+    * Removed python 2 dependencies
+    * Fixed issue with MarkupInfo field on AccountBasedExpenseLineDetail
+    * Removed test files from package
+
 * 0.9.3 (March 7, 2023)
     * Added support for Recurring Transaction
     * Added support for optional query params

MANIFEST.in

@@ -1,3 +1,3 @@
 include README.md
 include LICENSE
-recursive-include tests *
+recursive-exclude tests *

Makefile

@@ -1,4 +1,3 @@
-
 publish: clean
 	python setup.py sdist
 	twine upload dist/*

Pipfile

@@ -10,9 +10,8 @@ urllib3 = ">=1.26.5"
 bleach = ">=3.3.0"
 intuit-oauth = "==1.2.4"
 rauth = ">=0.7.3"
-requests = ">=2.26.0"
-simplejson = ">=3.17.0"
-six = ">=1.14.0"
+requests = ">=2.31.0"
+simplejson = ">=3.19.1"
 nose = "*"
 coverage = "*"
 twine = "*"

README.md

@@ -4,6 +4,7 @@ python-quickbooks
 [![Python package](https://github.com/ej2/python-quickbooks/actions/workflows/python-package.yml/badge.svg)](https://github.com/ej2/python-quickbooks/actions/workflows/python-package.yml)
 [![Coverage Status](https://coveralls.io/repos/github/ej2/python-quickbooks/badge.svg?branch=master)](https://coveralls.io/github/ej2/python-quickbooks?branch=master)
 [![](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/ej2/python-quickbooks/blob/master/LICENSE)
+[![PyPI](https://img.shields.io/pypi/v/python-quickbooks)](https://pypi.org/project/python-quickbooks/)
 
 A Python 3 library for accessing the Quickbooks API. Complete rework of
 [quickbooks-python](https://github.com/troolee/quickbooks-python).
@@ -14,6 +15,13 @@ You can find additional examples of usage in [Integration tests folder](https://
 
 For information about contributing, see the [Contributing Page](https://github.com/ej2/python-quickbooks/blob/master/contributing.md).
 
+Installation
+------------
+
+```bash
+pip install python-quickbooks
+```
+
 QuickBooks OAuth
 ------------------------------------------------
 

dev_requirements.txt

@@ -1,4 +1,4 @@
-coverage==6.4.2
-ipdb==0.13.9
-mock==2.0.0
+coverage==7.3.0
+ipdb==0.13.13
+mock==5.1.0
 nose==1.3.7

quickbooks/mixins.py

@@ -1,9 +1,8 @@
-from future.moves.urllib.parse import quote
+from urllib.parse import quote
 
 try: import simplejson as json
 except ImportError: import json
 
-import six
 from .utils import build_where_clause, build_choose_clause
 from .client import QuickBooks
 from .exceptions import QuickbooksException
@@ -70,14 +69,9 @@ def to_dict(obj, classkey=None):
     elif hasattr(obj, "__iter__") and not isinstance(obj, str):
         return [to_dict(v, classkey) for v in obj]
     elif hasattr(obj, "__dict__"):
-        if six.PY2:
-            data = dict([(key, to_dict(value, classkey))
-                        for key, value in obj.__dict__.iteritems()
-                        if not callable(value) and not key.startswith('_')])
-        else:
-            data = dict([(key, to_dict(value, classkey))
-                        for key, value in obj.__dict__.items()
-                        if not callable(value) and not key.startswith('_')])
+        data = dict([(key, to_dict(value, classkey))
+                    for key, value in obj.__dict__.items()
+                    if not callable(value) and not key.startswith('_')])
 
         if classkey is not None and hasattr(obj, "__class__"):
             data[classkey] = obj.__class__.__name__

quickbooks/objects/account.py

@@ -1,8 +1,6 @@
-from six import python_2_unicode_compatible
 from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
-@python_2_unicode_compatible
 class Account(QuickbooksManagedObject, QuickbooksTransactionEntity):
     """
     QBO definition: Account is a component of a Chart Of Accounts, and is part of a Ledger. Used to record a total

quickbooks/objects/attachable.py

@@ -1,10 +1,8 @@
-from six import python_2_unicode_compatible
 from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, AttachableRef
 from ..client import QuickBooks
 from ..mixins import DeleteMixin
 
 
-@python_2_unicode_compatible
 class Attachable(DeleteMixin, QuickbooksManagedObject, QuickbooksTransactionEntity):
     """
     QBO definition: This page covers the Attachable, Upload, and Download resources used for attachment management. Attachments are supplemental information linked to a transaction or Item object. They can be files, notes, or a combination of both.

quickbooks/objects/base.py

@@ -1,4 +1,3 @@
-from six import python_2_unicode_compatible
 from ..mixins import ToDictMixin, ToJsonMixin, FromJsonMixin, ListMixin, ReadMixin, UpdateMixin
 
 
@@ -24,7 +23,6 @@ class QuickbooksReadOnlyObject(QuickbooksBaseObject, ReadMixin, ListMixin):
     pass
 
 
-@python_2_unicode_compatible
 class MetaData(FromJsonMixin):
     def __init__(self):
         self.CreateTime = ""
@@ -44,7 +42,6 @@ def to_linked_txn(self):
         return linked_txn
 
 
-@python_2_unicode_compatible
 class Address(QuickbooksBaseObject):
     def __init__(self):
         self.Id = None
@@ -65,7 +62,6 @@ def __str__(self):
         return "{0} {1}, {2} {3}".format(self.Line1, self.City, self.CountrySubDivisionCode, self.PostalCode)
 
 
-@python_2_unicode_compatible
 class PhoneNumber(ToJsonMixin, FromJsonMixin, ToDictMixin):
     def __init__(self):
         self.FreeFormNumber = ""
@@ -74,7 +70,6 @@ def __str__(self):
         return self.FreeFormNumber
 
 
-@python_2_unicode_compatible
 class EmailAddress(QuickbooksBaseObject):
     def __init__(self):
         self.Address = ""
@@ -83,7 +78,6 @@ def __str__(self):
         return self.Address
 
 
-@python_2_unicode_compatible
 class WebAddress(QuickbooksBaseObject):
     def __init__(self):
         self.URI = ""
@@ -92,7 +86,6 @@ def __str__(self):
         return self.URI
 
 
-@python_2_unicode_compatible
 class Ref(QuickbooksBaseObject):
     def __init__(self):
         self.value = ""
@@ -103,7 +96,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
 class CustomField(QuickbooksBaseObject):
     def __init__(self):
         self.DefinitionId = ""
@@ -115,7 +107,6 @@ def __str__(self):
         return self.Name
 
 
-@python_2_unicode_compatible
 class LinkedTxn(QuickbooksBaseObject):
     qbo_object_name = "LinkedTxn"
 
@@ -129,7 +120,6 @@ def __str__(self):
         return str(self.TxnId)
 
 
-@python_2_unicode_compatible
 class CustomerMemo(QuickbooksBaseObject):
     def __init__(self):
         super(CustomerMemo, self).__init__()

quickbooks/objects/batchrequest.py

@@ -1,4 +1,3 @@
-from six import python_2_unicode_compatible
 from ..mixins import ToJsonMixin, FromJsonMixin
 
 
@@ -8,7 +7,6 @@ class BatchOperation(object):
     DELETE = "delete"
 
 
-@python_2_unicode_compatible
 class FaultError(FromJsonMixin):
     qbo_object_name = "Error"
 

quickbooks/objects/bill.py

@@ -1,5 +1,3 @@
-from six import python_2_unicode_compatible
-
 from quickbooks.objects.detailline import DetailLine, ItemBasedExpenseLine, AccountBasedExpenseLine, \
     TDSLine
 from .base import Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity, \
@@ -8,7 +6,6 @@
 from ..mixins import DeleteMixin
 
 
-@python_2_unicode_compatible
 class Bill(DeleteMixin, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
     """
     QBO definition: A Bill entity is an AP transaction representing a request-for-payment from a third party for
@@ -79,4 +76,3 @@ def to_ref(self):
         ref.value = self.Id
 
         return ref
-

quickbooks/objects/billpayment.py

@@ -1,10 +1,8 @@
-from six import python_2_unicode_compatible
 from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
     QuickbooksTransactionEntity
 from ..mixins import DeleteMixin
 
 
-@python_2_unicode_compatible
 class CheckPayment(QuickbooksBaseObject):
     class_dict = {
         "BankAccountRef": Ref
@@ -33,7 +31,6 @@ def __init__(self):
         self.CCAccountRef = None
 
 
-@python_2_unicode_compatible
 class BillPaymentLine(QuickbooksBaseObject):
     list_dict = {
         "LinkedTxn": LinkedTxn
@@ -50,7 +47,6 @@ def __str__(self):
         return str(self.Amount)
 
 
-@python_2_unicode_compatible
 class BillPayment(DeleteMixin, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
     """
     QBO definition: A BillPayment entity represents the financial transaction of payment

quickbooks/objects/budget.py

@@ -1,9 +1,7 @@
-from six import python_2_unicode_compatible
 from .base import QuickbooksBaseObject, Ref, QuickbooksTransactionEntity, \
     QuickbooksReadOnlyObject
 
 
-@python_2_unicode_compatible
 class BudgetDetail(QuickbooksBaseObject):
     class_dict = {
         "AccountRef": Ref,
@@ -26,7 +24,6 @@ def __str__(self):
         return str(self.Amount)
 
 
-@python_2_unicode_compatible
 class Budget(QuickbooksReadOnlyObject, QuickbooksTransactionEntity):
     """
     QBO definition: The Budget endpoint allows you to retrieve the current state of budgets already set up in the user's
@@ -56,4 +53,3 @@ def __init__(self):
 
     def __str__(self):
         return self.Name
-

quickbooks/objects/changedatacapture.py

@@ -2,14 +2,14 @@
 
 
 class CDCResponse(FromJsonMixin):
-	qbo_object_name = "CDCResponse"
+    qbo_object_name = "CDCResponse"
 
-	def __init__(self):
-		super(CDCResponse, self).__init__()
+    def __init__(self):
+        super(CDCResponse, self).__init__()
 
 
 class QueryResponse(FromJsonMixin, ObjectListMixin):
-	qbo_object_name = "QueryResponse"
+    qbo_object_name = "QueryResponse"
 
-	def __init__(self):
-		super(QueryResponse, self).__init__()
+    def __init__(self):
+        super(QueryResponse, self).__init__()

quickbooks/objects/company_info.py

@@ -1,9 +1,7 @@
-from six import python_2_unicode_compatible
 from .base import Address, PhoneNumber, EmailAddress, WebAddress, \
     QuickbooksManagedObject, Ref, MetaData
 
 
-@python_2_unicode_compatible
 class CompanyInfo(QuickbooksManagedObject):
     """
     QBO definition: The CompanyInfo entity contains basic company information.

quickbooks/objects/companycurrency.py

@@ -1,8 +1,6 @@
-from six import python_2_unicode_compatible
 from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref, CustomField, MetaData
 
 
-@python_2_unicode_compatible
 class CompanyCurrency(QuickbooksManagedObject, QuickbooksTransactionEntity):
     """
     QBO definition: Applicable only for those companies that enable multicurrency, a companycurrency object

quickbooks/objects/creditcardpayment_entity.py

@@ -1,9 +1,7 @@
-from six import python_2_unicode_compatible
 from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, MetaData
 from ..mixins import DeleteMixin
 
 
-@python_2_unicode_compatible
 class CreditCardPayment(DeleteMixin, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
     """
     QBO definition: A Represents a financial transaction to record a Credit Card balance payment

quickbooks/objects/creditmemo.py

@@ -1,13 +1,10 @@
-from six import python_2_unicode_compatible
-
 from quickbooks.objects.detailline import SalesItemLine, SubtotalLine, DiscountLine, DescriptionOnlyLine, DetailLine
 from .base import Address, EmailAddress, Ref, CustomField, CustomerMemo, QuickbooksManagedObject, \
     LinkedTxnMixin, QuickbooksTransactionEntity
 from .tax import TxnTaxDetail
 from ..mixins import DeleteMixin
 
 
-@python_2_unicode_compatible
 class CreditMemo(DeleteMixin, QuickbooksTransactionEntity, QuickbooksManagedObject, LinkedTxnMixin):
     """
     QBO definition: The CreditMemo is a financial transaction representing a refund or credit of payment or part

quickbooks/objects/customer.py

@@ -1,9 +1,7 @@
-from six import python_2_unicode_compatible
 from .base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksManagedObject, \
     QuickbooksTransactionEntity
 
 
-@python_2_unicode_compatible
 class Customer(QuickbooksManagedObject, QuickbooksTransactionEntity):
     """
     QBO definition: A customer is a consumer of the service or product that your business offers. The Customer object

quickbooks/objects/customertype.py

@@ -1,9 +1,7 @@
-from six import python_2_unicode_compatible
 from .base import Address, PhoneNumber, EmailAddress, WebAddress, MetaData, QuickbooksReadOnlyObject, \
     QuickbooksTransactionEntity
 
 
-@python_2_unicode_compatible
 class CustomerType(QuickbooksReadOnlyObject, QuickbooksTransactionEntity):
     """
     QBO definition: Customer types allow categorizing customers in ways that are meaningful to the business.

quickbooks/objects/department.py

@@ -1,8 +1,6 @@
-from six import python_2_unicode_compatible
 from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
 
 
-@python_2_unicode_compatible
 class Department(QuickbooksManagedObject, QuickbooksTransactionEntity):
     """
     QBO definition: The Department entity provides a way to track different segments of the business, divisions, or

quickbooks/objects/deposit.py

@@ -1,4 +1,3 @@
-from six import python_2_unicode_compatible
 from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
     QuickbooksTransactionEntity, CustomField, AttachableRef
 from ..mixins import DeleteMixin
@@ -35,7 +34,6 @@ def __init__(self):
         self.PaymentMethodRef = None
 
 
-@python_2_unicode_compatible
 class DepositLine(QuickbooksBaseObject):
     class_dict = {
         "DepositToAccountRef": Ref,
@@ -63,7 +61,6 @@ def __str__(self):
         return str(self.Amount)
 
 
-@python_2_unicode_compatible
 class Deposit(DeleteMixin, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
     """
     QBO definition: A deposit object is a transaction that records one or more deposits of the following types: