Updated imports to be python 3 compliant.

ej2 · ej2 · commit 83aa522c7875 · 2015-09-18T10:47:24.000-05:00
diff --git a/quickbooks/batch.py b/quickbooks/batch.py
@@ -1,8 +1,8 @@
 import uuid
 
-from client import QuickBooks
-from exceptions import QuickbooksException
-from objects.batchrequest import IntuitBatchRequest, BatchItemRequest, BatchOperation, BatchResponse, BatchItemResponse
+from .client import QuickBooks
+from .exceptions import QuickbooksException
+from .objects.batchrequest import IntuitBatchRequest, BatchItemRequest, BatchOperation, BatchResponse, BatchItemResponse
 
 
 class BatchManager(object):
diff --git a/quickbooks/client.py b/quickbooks/client.py
@@ -1,7 +1,9 @@
-import httplib
-import six
+try:
+    import httplib  # Python 2
+except ImportError:
+    import http.client as httplib  # Python 3
 
-from exceptions import QuickbooksException, SevereException
+from .exceptions import QuickbooksException, SevereException
 
 try:
     from rauth import OAuth1Session, OAuth1Service
diff --git a/quickbooks/mixins.py b/quickbooks/mixins.py
@@ -1,13 +1,16 @@
 import simplejson as json
-from utils import build_where_clause
-from client import QuickBooks
+from .utils import build_where_clause
+from .client import QuickBooks
+
 
 class ToJsonMixin(object):
     def to_json(self):
         return json.dumps(self, default=self.json_filter(), sort_keys=True, indent=4)
 
     def json_filter(self):
-        # filter out properties that have names starting with _ or properties that have a value of None
+        """
+        filter out properties that have names starting with _ or properties that have a value of None
+        """
         return lambda obj: {k: v for k, v in obj.__dict__.items()
                                    if not k.startswith('_') and getattr(obj, k) is not None}
 
diff --git a/quickbooks/objects/account.py b/quickbooks/objects/account.py
@@ -1,4 +1,4 @@
-from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
+from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
 class Account(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/bill.py b/quickbooks/objects/bill.py
@@ -1,6 +1,6 @@
-from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity, \
+from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity, \
     LinkedTxnMixin, MarkupInfo
-from tax import TxnTaxDetail
+from .tax import TxnTaxDetail
 
 
 class AccountBasedExpenseLineDetail(QuickbooksBaseObject):
diff --git a/quickbooks/objects/billpayment.py b/quickbooks/objects/billpayment.py
@@ -1,4 +1,4 @@
-from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
+from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
     QuickbooksTransactionEntity
 
 
diff --git a/quickbooks/objects/budget.py b/quickbooks/objects/budget.py
@@ -1,4 +1,4 @@
-from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
+from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
 class BudgetDetail(QuickbooksBaseObject):
diff --git a/quickbooks/objects/creditcardpayment.py b/quickbooks/objects/creditcardpayment.py
@@ -1,4 +1,4 @@
-from base import QuickbooksBaseObject
+from .base import QuickbooksBaseObject
 
 
 class CreditChargeInfo(QuickbooksBaseObject):
diff --git a/quickbooks/objects/creditmemo.py b/quickbooks/objects/creditmemo.py
@@ -1,6 +1,6 @@
-from base import QuickbooksBaseObject, Address, EmailAddress, Ref, CustomField, CustomerMemo, QuickbooksManagedObject, \
+from .base import QuickbooksBaseObject, Address, EmailAddress, Ref, CustomField, CustomerMemo, QuickbooksManagedObject, \
     LinkedTxnMixin, LinkedTxn, MarkupInfo
-from tax import TxnTaxDetail
+from .tax import TxnTaxDetail
 
 
 class SalesItemLineDetail(QuickbooksBaseObject):
diff --git a/quickbooks/objects/customer.py b/quickbooks/objects/customer.py
@@ -1,4 +1,4 @@
-from base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksManagedObject, \
+from .base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksManagedObject, \
     QuickbooksTransactionEntity
 
 
diff --git a/quickbooks/objects/department.py b/quickbooks/objects/department.py
@@ -1,4 +1,4 @@
-from base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
+from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
 
 
 class Department(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/deposit.py b/quickbooks/objects/deposit.py
@@ -1,4 +1,4 @@
-from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
+from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
     QuickbooksTransactionEntity, CustomField
 
 
diff --git a/quickbooks/objects/detailline.py b/quickbooks/objects/detailline.py
@@ -1,4 +1,4 @@
-from base import QuickbooksBaseObject, Ref, CustomField, LinkedTxn, MarkupInfo
+from .base import QuickbooksBaseObject, Ref, CustomField, LinkedTxn, MarkupInfo
 
 
 class DetailLine(QuickbooksBaseObject):
diff --git a/quickbooks/objects/employee.py b/quickbooks/objects/employee.py
@@ -1,4 +1,4 @@
-from base import Address, PhoneNumber, QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
+from .base import Address, PhoneNumber, QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
 
 
 class Employee(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/estimate.py b/quickbooks/objects/estimate.py
@@ -1,7 +1,7 @@
-from base import QuickbooksBaseObject, CustomField, Ref, CustomerMemo, Address, EmailAddress, QuickbooksManagedObject, \
+from .base import QuickbooksBaseObject, CustomField, Ref, CustomerMemo, Address, EmailAddress, QuickbooksManagedObject, \
     LinkedTxnMixin, QuickbooksTransactionEntity, LinkedTxn
-from tax import TxnTaxDetail
-from detailline import DetailLine
+from .tax import TxnTaxDetail
+from .detailline import DetailLine
 
 
 class Estimate(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
diff --git a/quickbooks/objects/invoice.py b/quickbooks/objects/invoice.py
@@ -1,7 +1,7 @@
-from base import QuickbooksBaseObject, Ref, CustomField, Address, EmailAddress, CustomerMemo, QuickbooksManagedObject, \
+from .base import QuickbooksBaseObject, Ref, CustomField, Address, EmailAddress, CustomerMemo, QuickbooksManagedObject, \
     QuickbooksTransactionEntity, LinkedTxn, LinkedTxnMixin
-from tax import TxnTaxDetail
-from detailline import DetailLine
+from .tax import TxnTaxDetail
+from .detailline import DetailLine
 
 
 class DeliveryInfo(QuickbooksBaseObject):
diff --git a/quickbooks/objects/item.py b/quickbooks/objects/item.py
@@ -1,4 +1,4 @@
-from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
+from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
 class Item(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/journalentry.py b/quickbooks/objects/journalentry.py
@@ -1,7 +1,7 @@
-from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
+from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
     LinkedTxnMixin
-from tax import TxnTaxDetail
-from detailline import DetailLine
+from .tax import TxnTaxDetail
+from .detailline import DetailLine
 
 
 class Entity(QuickbooksBaseObject):
diff --git a/quickbooks/objects/payment.py b/quickbooks/objects/payment.py
@@ -1,5 +1,5 @@
-from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity
-from creditcardpayment import CreditCardPayment
+from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity
+from .creditcardpayment import CreditCardPayment
 
 
 class PaymentLine(QuickbooksBaseObject):
diff --git a/quickbooks/objects/paymentmethod.py b/quickbooks/objects/paymentmethod.py
@@ -1,4 +1,4 @@
-from base import QuickbooksManagedObject, QuickbooksTransactionEntity
+from .base import QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
 class PaymentMethod(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/purchase.py b/quickbooks/objects/purchase.py
@@ -1,7 +1,7 @@
-from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, \
+from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, \
     LinkedTxn, Address, CustomField, MarkupInfo
 
-from tax import TxnTaxDetail
+from .tax import TxnTaxDetail
 
 
 class AccountBasedExpenseLineDetail(QuickbooksBaseObject):
diff --git a/quickbooks/objects/purchaseorder.py b/quickbooks/objects/purchaseorder.py
@@ -1,6 +1,6 @@
-from base import QuickbooksBaseObject, Ref, Address, QuickbooksManagedObject, LinkedTxnMixin, \
+from .base import QuickbooksBaseObject, Ref, Address, QuickbooksManagedObject, LinkedTxnMixin, \
     QuickbooksTransactionEntity, CustomField, LinkedTxn, MarkupInfo
-from tax import TxnTaxDetail
+from .tax import TxnTaxDetail
 
 
 class ItemBasedExpenseLineDetail(QuickbooksBaseObject):
diff --git a/quickbooks/objects/refundreceipt.py b/quickbooks/objects/refundreceipt.py
@@ -1,7 +1,7 @@
-from base import Ref, CustomField, QuickbooksManagedObject, \
+from .base import Ref, CustomField, QuickbooksManagedObject, \
     LinkedTxnMixin, QuickbooksTransactionEntity, LinkedTxn, Address, EmailAddress
-from tax import TxnTaxDetail
-from detailline import DetailLine
+from .tax import TxnTaxDetail
+from .detailline import DetailLine
 
 
 class RefundReceipt(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
diff --git a/quickbooks/objects/salesreceipt.py b/quickbooks/objects/salesreceipt.py
@@ -1,7 +1,7 @@
-from base import QuickbooksBaseObject, Ref, CustomField, QuickbooksManagedObject, LinkedTxnMixin, Address, \
+from .base import QuickbooksBaseObject, Ref, CustomField, QuickbooksManagedObject, LinkedTxnMixin, Address, \
     EmailAddress, QuickbooksTransactionEntity, LinkedTxn
-from tax import TxnTaxDetail
-from detailline import DetailLine
+from .tax import TxnTaxDetail
+from .detailline import DetailLine
 
 
 class SalesReceipt(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
diff --git a/quickbooks/objects/tax.py b/quickbooks/objects/tax.py
@@ -1,4 +1,4 @@
-from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject
+from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject
 
 
 class TaxLineDetail(QuickbooksBaseObject):
diff --git a/quickbooks/objects/taxagency.py b/quickbooks/objects/taxagency.py
@@ -1,4 +1,4 @@
-from base import QuickbooksTransactionEntity, QuickbooksManagedObject
+from .base import QuickbooksTransactionEntity, QuickbooksManagedObject
 
 
 class TaxAgency(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/taxcode.py b/quickbooks/objects/taxcode.py
@@ -1,4 +1,4 @@
-from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
+from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
 class TaxRateDetail(QuickbooksBaseObject):
diff --git a/quickbooks/objects/taxrate.py b/quickbooks/objects/taxrate.py
@@ -1,4 +1,4 @@
-from base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
+from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
 
 
 class TaxRate(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/term.py b/quickbooks/objects/term.py
@@ -1,4 +1,4 @@
-from base import QuickbooksManagedObject, QuickbooksTransactionEntity, AttachableRef
+from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, AttachableRef
 
 
 class Term(QuickbooksManagedObject, QuickbooksTransactionEntity):
diff --git a/quickbooks/objects/timeactivity.py b/quickbooks/objects/timeactivity.py
@@ -1,4 +1,4 @@
-from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, AttachableRef
+from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, AttachableRef
 
 
 class TimeActivity(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
diff --git a/quickbooks/objects/transfer.py b/quickbooks/objects/transfer.py
@@ -1,4 +1,4 @@
-from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin
+from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin
 
 
 class Transfer(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
diff --git a/quickbooks/objects/vendor.py b/quickbooks/objects/vendor.py
@@ -1,4 +1,4 @@
-from base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksBaseObject, \
+from .base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksBaseObject, \
     QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
diff --git a/quickbooks/objects/vendorcredit.py b/quickbooks/objects/vendorcredit.py
@@ -1,6 +1,6 @@
-from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
+from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
     LinkedTxnMixin, MarkupInfo
-from detailline import DetailLine
+from .detailline import DetailLine
 
 
 class ItemBasedExpenseLineDetail(QuickbooksBaseObject):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity`
	`1`	`+from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity`
`2`	`2`
`3`	`3`
`4`	`4`	`class Account(QuickbooksManagedObject, QuickbooksTransactionEntity):`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \`
	`1`	`+from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \`
`2`	`2`	`QuickbooksTransactionEntity`
`3`	`3`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from base import QuickbooksBaseObject`
	`1`	`+from .base import QuickbooksBaseObject`
`2`	`2`
`3`	`3`
`4`	`4`	`class CreditChargeInfo(QuickbooksBaseObject):`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksManagedObject, \`
	`1`	`+from .base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksManagedObject, \`
`2`	`2`	`QuickbooksTransactionEntity`
`3`	`3`
`4`	`4`