Skip to content

Commit 83aa522

Browse files
ej2ej2
committed
Updated imports to be python 3 compliant.
1 parent fb850dd commit 83aa522

33 files changed

+60
-55
lines changed

‎quickbooks/batch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import uuid
22

3-
from client import QuickBooks
4-
from exceptions import QuickbooksException
5-
from objects.batchrequest import IntuitBatchRequest, BatchItemRequest, BatchOperation, BatchResponse, BatchItemResponse
3+
from .client import QuickBooks
4+
from .exceptions import QuickbooksException
5+
from .objects.batchrequest import IntuitBatchRequest, BatchItemRequest, BatchOperation, BatchResponse, BatchItemResponse
66

77

88
class BatchManager(object):

‎quickbooks/client.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import httplib
2-
import six
1+
try:
2+
import httplib # Python 2
3+
except ImportError:
4+
import http.client as httplib # Python 3
35

4-
from exceptions import QuickbooksException, SevereException
6+
from .exceptions import QuickbooksException, SevereException
57

68
try:
79
from rauth import OAuth1Session, OAuth1Service

‎quickbooks/mixins.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import simplejson as json
2-
from utils import build_where_clause
3-
from client import QuickBooks
2+
from .utils import build_where_clause
3+
from .client import QuickBooks
4+
45

56
class ToJsonMixin(object):
67
def to_json(self):
78
return json.dumps(self, default=self.json_filter(), sort_keys=True, indent=4)
89

910
def json_filter(self):
10-
# filter out properties that have names starting with _ or properties that have a value of None
11+
"""
12+
filter out properties that have names starting with _ or properties that have a value of None
13+
"""
1114
return lambda obj: {k: v for k, v in obj.__dict__.items()
1215
if not k.startswith('_') and getattr(obj, k) is not None}
1316

‎quickbooks/objects/account.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
1+
from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
22

33

44
class Account(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/bill.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity, \
1+
from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity, \
22
LinkedTxnMixin, MarkupInfo
3-
from tax import TxnTaxDetail
3+
from .tax import TxnTaxDetail
44

55

66
class AccountBasedExpenseLineDetail(QuickbooksBaseObject):

‎quickbooks/objects/billpayment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
1+
from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
22
QuickbooksTransactionEntity
33

44

‎quickbooks/objects/budget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
1+
from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
22

33

44
class BudgetDetail(QuickbooksBaseObject):

‎quickbooks/objects/creditcardpayment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksBaseObject
1+
from .base import QuickbooksBaseObject
22

33

44
class CreditChargeInfo(QuickbooksBaseObject):

‎quickbooks/objects/creditmemo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from base import QuickbooksBaseObject, Address, EmailAddress, Ref, CustomField, CustomerMemo, QuickbooksManagedObject, \
1+
from .base import QuickbooksBaseObject, Address, EmailAddress, Ref, CustomField, CustomerMemo, QuickbooksManagedObject, \
22
LinkedTxnMixin, LinkedTxn, MarkupInfo
3-
from tax import TxnTaxDetail
3+
from .tax import TxnTaxDetail
44

55

66
class SalesItemLineDetail(QuickbooksBaseObject):

‎quickbooks/objects/customer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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, \
22
QuickbooksTransactionEntity
33

44

‎quickbooks/objects/department.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
1+
from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
22

33

44
class Department(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/deposit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
1+
from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, LinkedTxnMixin, \
22
QuickbooksTransactionEntity, CustomField
33

44

‎quickbooks/objects/detailline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksBaseObject, Ref, CustomField, LinkedTxn, MarkupInfo
1+
from .base import QuickbooksBaseObject, Ref, CustomField, LinkedTxn, MarkupInfo
22

33

44
class DetailLine(QuickbooksBaseObject):

‎quickbooks/objects/employee.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import Address, PhoneNumber, QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
1+
from .base import Address, PhoneNumber, QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
22

33

44
class Employee(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/estimate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from base import QuickbooksBaseObject, CustomField, Ref, CustomerMemo, Address, EmailAddress, QuickbooksManagedObject, \
1+
from .base import QuickbooksBaseObject, CustomField, Ref, CustomerMemo, Address, EmailAddress, QuickbooksManagedObject, \
22
LinkedTxnMixin, QuickbooksTransactionEntity, LinkedTxn
3-
from tax import TxnTaxDetail
4-
from detailline import DetailLine
3+
from .tax import TxnTaxDetail
4+
from .detailline import DetailLine
55

66

77
class Estimate(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):

‎quickbooks/objects/invoice.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from base import QuickbooksBaseObject, Ref, CustomField, Address, EmailAddress, CustomerMemo, QuickbooksManagedObject, \
1+
from .base import QuickbooksBaseObject, Ref, CustomField, Address, EmailAddress, CustomerMemo, QuickbooksManagedObject, \
22
QuickbooksTransactionEntity, LinkedTxn, LinkedTxnMixin
3-
from tax import TxnTaxDetail
4-
from detailline import DetailLine
3+
from .tax import TxnTaxDetail
4+
from .detailline import DetailLine
55

66

77
class DeliveryInfo(QuickbooksBaseObject):

‎quickbooks/objects/item.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
1+
from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
22

33

44
class Item(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/journalentry.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
1+
from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
22
LinkedTxnMixin
3-
from tax import TxnTaxDetail
4-
from detailline import DetailLine
3+
from .tax import TxnTaxDetail
4+
from .detailline import DetailLine
55

66

77
class Entity(QuickbooksBaseObject):

‎quickbooks/objects/payment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity
2-
from creditcardpayment import CreditCardPayment
1+
from .base import QuickbooksBaseObject, Ref, LinkedTxn, QuickbooksManagedObject, QuickbooksTransactionEntity
2+
from .creditcardpayment import CreditCardPayment
33

44

55
class PaymentLine(QuickbooksBaseObject):

‎quickbooks/objects/paymentmethod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksManagedObject, QuickbooksTransactionEntity
1+
from .base import QuickbooksManagedObject, QuickbooksTransactionEntity
22

33

44
class PaymentMethod(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/purchase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, \
1+
from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, \
22
LinkedTxn, Address, CustomField, MarkupInfo
33

4-
from tax import TxnTaxDetail
4+
from .tax import TxnTaxDetail
55

66

77
class AccountBasedExpenseLineDetail(QuickbooksBaseObject):

‎quickbooks/objects/purchaseorder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from base import QuickbooksBaseObject, Ref, Address, QuickbooksManagedObject, LinkedTxnMixin, \
1+
from .base import QuickbooksBaseObject, Ref, Address, QuickbooksManagedObject, LinkedTxnMixin, \
22
QuickbooksTransactionEntity, CustomField, LinkedTxn, MarkupInfo
3-
from tax import TxnTaxDetail
3+
from .tax import TxnTaxDetail
44

55

66
class ItemBasedExpenseLineDetail(QuickbooksBaseObject):

‎quickbooks/objects/refundreceipt.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from base import Ref, CustomField, QuickbooksManagedObject, \
1+
from .base import Ref, CustomField, QuickbooksManagedObject, \
22
LinkedTxnMixin, QuickbooksTransactionEntity, LinkedTxn, Address, EmailAddress
3-
from tax import TxnTaxDetail
4-
from detailline import DetailLine
3+
from .tax import TxnTaxDetail
4+
from .detailline import DetailLine
55

66

77
class RefundReceipt(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):

‎quickbooks/objects/salesreceipt.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from base import QuickbooksBaseObject, Ref, CustomField, QuickbooksManagedObject, LinkedTxnMixin, Address, \
1+
from .base import QuickbooksBaseObject, Ref, CustomField, QuickbooksManagedObject, LinkedTxnMixin, Address, \
22
EmailAddress, QuickbooksTransactionEntity, LinkedTxn
3-
from tax import TxnTaxDetail
4-
from detailline import DetailLine
3+
from .tax import TxnTaxDetail
4+
from .detailline import DetailLine
55

66

77
class SalesReceipt(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):

‎quickbooks/objects/tax.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject
1+
from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject
22

33

44
class TaxLineDetail(QuickbooksBaseObject):

‎quickbooks/objects/taxagency.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksTransactionEntity, QuickbooksManagedObject
1+
from .base import QuickbooksTransactionEntity, QuickbooksManagedObject
22

33

44
class TaxAgency(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/taxcode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
1+
from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
22

33

44
class TaxRateDetail(QuickbooksBaseObject):

‎quickbooks/objects/taxrate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
1+
from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, Ref
22

33

44
class TaxRate(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/term.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import QuickbooksManagedObject, QuickbooksTransactionEntity, AttachableRef
1+
from .base import QuickbooksManagedObject, QuickbooksTransactionEntity, AttachableRef
22

33

44
class Term(QuickbooksManagedObject, QuickbooksTransactionEntity):

‎quickbooks/objects/timeactivity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, AttachableRef
1+
from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin, AttachableRef
22

33

44
class TimeActivity(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):

‎quickbooks/objects/transfer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin
1+
from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin
22

33

44
class Transfer(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):

‎quickbooks/objects/vendor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksBaseObject, \
1+
from .base import Address, PhoneNumber, EmailAddress, WebAddress, Ref, QuickbooksBaseObject, \
22
QuickbooksManagedObject, QuickbooksTransactionEntity
33

44

‎quickbooks/objects/vendorcredit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
1+
from .base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
22
LinkedTxnMixin, MarkupInfo
3-
from detailline import DetailLine
3+
from .detailline import DetailLine
44

55

66
class ItemBasedExpenseLineDetail(QuickbooksBaseObject):

0 commit comments

Comments
 (0)