Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3 compatibility #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions example.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
# Example 1: Add Contact
#----------------------------------------------------------------------------------------
contact = {'FirstName' : 'John', 'LastName' : 'Doe', 'Email' : '[email protected]'}
print infusionsoft.ContactService('add', contact)
print(infusionsoft.ContactService('add', contact))

# Example 2: Merge two duplicate contacts
#----------------------------------------------------------------------------------------
contactId = 56
duplicateContactId = 57
print infusionsoft.ContactService('merge', contactId, duplicateContactId)
print(infusionsoft.ContactService('merge', contactId, duplicateContactId))

# Example 3: Query a contact using data service
#----------------------------------------------------------------------------------------
Expand All @@ -20,12 +20,12 @@
query = {'FirstName' : 'John'}
limit = 10
page = 0
print infusionsoft.DataService('query', table, limit, page, query, returnFields)
print(infusionsoft.DataService('query', table, limit, page, query, returnFields))

# Example 4: Return a products inventory using product service
#----------------------------------------------------------------------------------------
productId = 1
print infusionsoft.ProductService('getInventory', productId)
print(infusionsoft.ProductService('getInventory', productId))

# Example 5: Charge an invoice using the invoice service
#----------------------------------------------------------------------------------------
Expand All @@ -34,7 +34,7 @@
creditCardId = 2
merchantAccountId = 1
bypassCommissions = False
print infusionsoft.InvoiceService('chargeInvoice', invoiceId, notes, creditCardId, merchantAccountId, bypassCommissions)
print(infusionsoft.InvoiceService('chargeInvoice', invoiceId, notes, creditCardId, merchantAccountId, bypassCommissions))

# Example 6: Send an email using the email service
#----------------------------------------------------------------------------------------
Expand All @@ -47,32 +47,32 @@
subject = 'This is just a test email, relax!'
htmlBody = ''
textBody = 'This is the contant for the email'
print infusionsoft.APIEmailService('sendEmail', contactList, fromAddress, toAddress, ccAddress, bccAddress, contentType, subject, htmlBody, textBody)
print(infusionsoft.APIEmailService('sendEmail', contactList, fromAddress, toAddress, ccAddress, bccAddress, contentType, subject, htmlBody, textBody))

# Example 7: Get all report columns using the search service
#----------------------------------------------------------------------------------------
savedSearchId = 3
userId = 1
print infusionsoft.SearchService('getAllReportColumns', savedSearchId, userId)
print(infusionsoft.SearchService('getAllReportColumns', savedSearchId, userId))

# Example 8: Get all shipping options with the shipping service
#----------------------------------------------------------------------------------------
print infusionsoft.ShippingService('getAllShippingOptions')
print(infusionsoft.ShippingService('getAllShippingOptions'))

# Example 9: Get affiliate payouts info using filter with the affiliate service
#----------------------------------------------------------------------------------------
from datetime import datetime
affiliateId = 2
filterStartDate = datetime(2012, 10, 18)
filterEndDate = datetime(2012, 10, 23)
print infusionsoft.APIAffiliateService('affPayouts', affiliateId, filterStartDate, filterEndDate)
print(infusionsoft.APIAffiliateService('affPayouts', affiliateId, filterStartDate, filterEndDate))

# Example 10: Get the download URL of a particular file
#----------------------------------------------------------------------------------------
fileId = 23
print infusionsoft.FileService('getDownloadUrl', fileId)
print(infusionsoft.FileService('getDownloadUrl', fileId))

# Example 11: Using the library server method to access the API : Create a contact
#----------------------------------------------------------------------------------------
contact = {'FirstName' : 'John', 'LastName' : 'Doe', 'Email' : '[email protected]'}
print infusionsoft.server().ContactService.add(infusionsoft.key, contact)
print(infusionsoft.server().ContactService.add(infusionsoft.key, contact))
27 changes: 13 additions & 14 deletions infusionsoft/library.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
from xmlrpclib import ServerProxy, Error
try:
from xmlrpclib import ServerProxy, Error
except ImportError:
from xmlrpc.client import ServerProxy, Error


class Infusionsoft(object):
base_uri = 'https://%s.infusionsoft.com/api/xmlrpc'
class Infusionsoft(object):
base_uri = 'https://%s.infusionsoft.com/api/xmlrpc'

def __init__(self, name, api_key, use_datetime=False):
def __init__(self, name, api_key, use_datetime=False):
uri = self.base_uri % name
self.client = ServerProxy(uri, use_datetime=use_datetime)
self.client.error = Error
Expand All @@ -13,22 +16,18 @@ def __init__(self, name, api_key, use_datetime=False):
def __getattr__(self, service):
def function(method, *args):
call = getattr(self.client, service + '.' + method)
try:
return call(self.key, *args)
except self.client.error, v:
return "ERROR", v
return call(self.key, *args)
return function

def server(self):
return self.client


class InfusionsoftOAuth(Infusionsoft):
base_uri = 'https://api.infusionsoft.com/crm/xmlrpc/v1?'

def __init__(self, access_token, use_datetime=False):
uri = '%saccess_token=%s' % (self.base_uri, access_token)
base_uri = 'https://api.infusionsoft.com/crm/xmlrpc/v1?'
def __init__(self, access_token, use_datetime=False):
uri = '%saccess_token=%s' % (self.base_uri, access_token)

self.client = ServerProxy(uri, use_datetime=use_datetime)
self.client.error = Error
self.key = access_token
self.key = access_token