From 5747b0d390e33dcd0610e1a5783d406af1dc5f29 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:03:07 -0500 Subject: [PATCH 01/34] Create setup.py --- includes/setup.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 includes/setup.py diff --git a/includes/setup.py b/includes/setup.py new file mode 100644 index 0000000..3d37ff0 --- /dev/null +++ b/includes/setup.py @@ -0,0 +1,10 @@ +from distutils.core import setup + +setup( + name='ActiveCampaign', + version='0.0.1', + author='mo', + packages=['includes'], + description='ActiveCampaign python API.', + long_description=open('README.md').read() +) From f3d8b744cfcec2bb6d9a4c7c0a5536a6fb9b1414 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:07:07 -0500 Subject: [PATCH 02/34] Rename includes/setup.py to setup.py --- includes/setup.py => setup.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename includes/setup.py => setup.py (100%) diff --git a/includes/setup.py b/setup.py similarity index 100% rename from includes/setup.py rename to setup.py From a5534967a3a1bc3198626f6fae09187c8e917a44 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:20:08 -0500 Subject: [PATCH 03/34] Update __init__.py --- includes/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/__init__.py b/includes/__init__.py index e69de29..e3d56b4 100644 --- a/includes/__init__.py +++ b/includes/__init__.py @@ -0,0 +1 @@ +__all__ = ['Account','ActiveCampaign','Campaign','Connector','Design','Form','Group','List','Message','Subscriber','User'] From cfd63c3bc30fc187366e11684507f29ba5b5d7bd Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:22:11 -0500 Subject: [PATCH 04/34] Update __init__.py --- includes/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/__init__.py b/includes/__init__.py index e3d56b4..3e11c98 100644 --- a/includes/__init__.py +++ b/includes/__init__.py @@ -1 +1 @@ -__all__ = ['Account','ActiveCampaign','Campaign','Connector','Design','Form','Group','List','Message','Subscriber','User'] +__all__ = ['Account','ActiveCampaign','Campaign','Config','Connector','Design','Form','Group','List','Message','Subscriber','User'] From 8878cedf01a19ad1d6efef0894cb1cf4bb7d4a15 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:23:23 -0500 Subject: [PATCH 05/34] Update Config.py --- includes/Config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/includes/Config.py b/includes/Config.py index d222caf..63dda1c 100644 --- a/includes/Config.py +++ b/includes/Config.py @@ -1,3 +1,2 @@ - ACTIVECAMPAIGN_URL = 'YOUR_ACTIVECAMPAIGN_URL' ACTIVECAMPAIGN_API_KEY = 'YOUR_ACTIVECAMPAIGN_API_KEY' From 8f62e7b598973d5bd30736409ad364d45a6bd174 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:26:13 -0500 Subject: [PATCH 06/34] Create __init__.py --- __init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 __init__.py diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..810bb65 --- /dev/null +++ b/__init__.py @@ -0,0 +1 @@ +__all__ = ['includes'] From eeda5bfe11ab6dd88477d9871f55eb19e9384a70 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:28:25 -0500 Subject: [PATCH 07/34] Update Account.py --- includes/Account.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/Account.py b/includes/Account.py index 3ba001e..6799d90 100644 --- a/includes/Account.py +++ b/includes/Account.py @@ -1,6 +1,6 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib @@ -63,4 +63,4 @@ def view(self, params, post_data = {}): ac = ActiveCampaign(ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY) ## view - #print ac.api('account/view') \ No newline at end of file + #print ac.api('account/view') From acc65676cca0aeebb7e21887ff16e2cd289391ac Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:28:57 -0500 Subject: [PATCH 08/34] Update ActiveCampaign.py --- includes/ActiveCampaign.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/ActiveCampaign.py b/includes/ActiveCampaign.py index f28cfd2..edd7116 100644 --- a/includes/ActiveCampaign.py +++ b/includes/ActiveCampaign.py @@ -1,6 +1,6 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from Connector import Connector +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.Connector import Connector class ActiveCampaign(Connector): From 251674640ff55339bc135259c28d98872e591a7b Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:29:12 -0500 Subject: [PATCH 09/34] Update Campaign.py --- includes/Campaign.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Campaign.py b/includes/Campaign.py index f296738..8d8b2f9 100644 --- a/includes/Campaign.py +++ b/includes/Campaign.py @@ -1,5 +1,5 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import simplejson as json import urllib2, urllib import datetime, time From af32f5a796b0b8d8fdaeb3909f0b73ae44051b5c Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:29:46 -0500 Subject: [PATCH 10/34] Update Campaign.py --- includes/Campaign.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Campaign.py b/includes/Campaign.py index 8d8b2f9..1a1fc71 100644 --- a/includes/Campaign.py +++ b/includes/Campaign.py @@ -127,8 +127,8 @@ def status(self, params, post_data = {}): } from time import time time2 = time() - print ac.api('campaign/create', campaign) - print 'diff2 = %.5f seconds' %(time() - time2) + print(ac.api('campaign/create', campaign)) + print('diff2 = %.5f seconds' %(time() - time2)) ## delete From 9269d9ae9a7a50bf8930869eaa40900858cd870f Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:30:00 -0500 Subject: [PATCH 11/34] Update Connector.py --- includes/Connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Connector.py b/includes/Connector.py index dce70e4..f3a3bd1 100644 --- a/includes/Connector.py +++ b/includes/Connector.py @@ -1,5 +1,5 @@ import json -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY import urllib2 class Connector(): From 43f10e43585480a3a7142daf39a44425a4954e7b Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:30:13 -0500 Subject: [PATCH 12/34] Update Design.py --- includes/Design.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Design.py b/includes/Design.py index 3410b83..8ebb553 100644 --- a/includes/Design.py +++ b/includes/Design.py @@ -1,5 +1,5 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib From 2212e43b9aa44013735f3013c4d9c864bf16d64b Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:30:38 -0500 Subject: [PATCH 13/34] Update Form.py --- includes/Form.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Form.py b/includes/Form.py index 0e16f9d..f9df7c3 100644 --- a/includes/Form.py +++ b/includes/Form.py @@ -1,5 +1,5 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib From 355d3cbbc5f01d453a255bc1748f2c12fa662cd0 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:30:56 -0500 Subject: [PATCH 14/34] Update Group.py --- includes/Group.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Group.py b/includes/Group.py index d9d9751..875c22c 100644 --- a/includes/Group.py +++ b/includes/Group.py @@ -1,6 +1,6 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib From 1a58170504bc67e9b9e660cd427c0d72d654feb5 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:31:08 -0500 Subject: [PATCH 15/34] Update List.py --- includes/List.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/List.py b/includes/List.py index 4267324..08ac2e9 100644 --- a/includes/List.py +++ b/includes/List.py @@ -1,6 +1,6 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib From 6ed1f948bcc010ce2562a0bbb4b31684772359ac Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:31:26 -0500 Subject: [PATCH 16/34] Update Message.py --- includes/Message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Message.py b/includes/Message.py index 9eec401..60903d3 100644 --- a/includes/Message.py +++ b/includes/Message.py @@ -1,6 +1,6 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib import datetime From 42a6a55600b872aa6e50c39c6afcf6006a3985c4 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:31:36 -0500 Subject: [PATCH 17/34] Update Subscriber.py --- includes/Subscriber.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Subscriber.py b/includes/Subscriber.py index 3cce8f3..fecb5c7 100644 --- a/includes/Subscriber.py +++ b/includes/Subscriber.py @@ -1,6 +1,6 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib From f7e3f18fc8918ff6230a89bba2c247ef44458bd7 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:31:57 -0500 Subject: [PATCH 18/34] Update User.py --- includes/User.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/User.py b/includes/User.py index 72a4e9b..b3f686d 100644 --- a/includes/User.py +++ b/includes/User.py @@ -1,6 +1,6 @@ -from Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -from ActiveCampaign import ActiveCampaign +from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY +from includes.ActiveCampaign import ActiveCampaign import json import urllib2, urllib From 9332cb49c64510161837939d91b22c2265560808 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:32:33 -0500 Subject: [PATCH 19/34] Update Connector.py --- includes/Connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Connector.py b/includes/Connector.py index f3a3bd1..1cdf08c 100644 --- a/includes/Connector.py +++ b/includes/Connector.py @@ -28,4 +28,4 @@ def credentials_test(self): if __name__ == '__main__': c = Connector(ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY) - print c.credentials_test() + print(c.credentials_test()) From f204835bbf42d97bb6cb788266d446e7dae29f72 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:35:25 -0500 Subject: [PATCH 20/34] Update Connector.py --- includes/Connector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Connector.py b/includes/Connector.py index 1cdf08c..1ad9490 100644 --- a/includes/Connector.py +++ b/includes/Connector.py @@ -1,6 +1,6 @@ import json from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY -import urllib2 +import urllib class Connector(): @@ -23,7 +23,7 @@ def __init__(self, url, api_key, api_user = '', api_pass = ''): def credentials_test(self): test_url = '%s&api_action=group_view&api_output=%s&id=3' % (self.url, self.output) - jdata = json.loads(urllib2.urlopen(test_url).read()) + jdata = json.loads(urllib.request.urlopen(test_url).read()) return jdata['result_code'] == 1 if __name__ == '__main__': From 6d51d30fb29ed75bbdd512c299427fcda0529e95 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:38:01 -0500 Subject: [PATCH 21/34] Update Account.py --- includes/Account.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/includes/Account.py b/includes/Account.py index 6799d90..039a581 100644 --- a/includes/Account.py +++ b/includes/Account.py @@ -2,7 +2,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib class Account(ActiveCampaign): @@ -14,8 +14,8 @@ def __init__(self, url, api_key): def add(self, params, post_data): request_url = '%s&api_action=account_add&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def cancel(self, params, post_data = {}): @@ -25,37 +25,37 @@ def cancel(self, params, post_data = {}): def edit(self, params, post_data): request_url = '%s&api_action=account_edit&api_output=%s' % (self.url, self.output) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def list_(self, params, post_data = {}): request_url = '%s&api_action=account_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def name_check(self, params, post_data = {}): request_url = '%s&api_action=account_name_check&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def plans(self, params, post_data = {}): request_url = '%s&api_action=account_plans&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def status(self, params, post_data = {}): request_url = '%s&api_action=account_status&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def status_set(self, params, post_data = {}): request_url = '%s&api_action=account_status_set&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def view(self, params, post_data = {}): request_url = '%s&api_action=account_view&api_output=%s' % (self.url, self.output) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response From b21bc2982d09ddf88daac26d06f20d3b759b771f Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:40:33 -0500 Subject: [PATCH 22/34] Update Campaign.py --- includes/Campaign.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/includes/Campaign.py b/includes/Campaign.py index 1a1fc71..3b2c3ca 100644 --- a/includes/Campaign.py +++ b/includes/Campaign.py @@ -1,7 +1,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign -import simplejson as json -import urllib2, urllib +import json +import urllib import datetime, time class Campaign(ActiveCampaign): @@ -14,98 +14,98 @@ def __init__(self, url, api_key): def create(self, params, post_data): request_url = '%s&api_action=campaign_create&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def delete(self, params, post_data = {}): request_url = '%s&api_action=campaign_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def delete_list(self, params, post_data = {}): request_url = '%s&api_action=campaign_delete_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def list_(self, params, post_data = {}): request_url = '%s&api_action=campaign_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def paginator(self, params, post_data = {}): request_url = '%s&api_action=campaign_paginator&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_bounce_list(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_bounce_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_bounce_totals(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_bounce_totals&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_forward_list(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_forward_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_forward_totals(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_forward_totals&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_link_list(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_link_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_link_totals(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_link_totals&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_open_list(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_open_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_open_totals(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_open_totals&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_totals(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_totals&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_unopen_list(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_unopen_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_unsubscription_list(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_unsubscription_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def report_unsubscription_totals(self, params, post_data = {}): request_url = '%s&api_action=campaign_report_unsubscription_totals&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def send(self, params, post_data = {}): request_url = '%s&api_action=campaign_send&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def status(self, params, post_data = {}): request_url = '%s&api_action=campaign_status&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response if __name__ == '__main__': From 51a04946ef4327071d40e9ffb82cd1852d5af485 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:41:46 -0500 Subject: [PATCH 23/34] Update Design.py --- includes/Design.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/Design.py b/includes/Design.py index 8ebb553..a44a063 100644 --- a/includes/Design.py +++ b/includes/Design.py @@ -1,7 +1,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib class Design(ActiveCampaign): @@ -13,13 +13,13 @@ def __init__(self, url, api_key): def edit(self, params, post_data): request_url = '%s&api_action=branding_edit&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def view(self, params, post_data): request_url = '%s&api_action=branding_view&api_output=%s' % (self.url, self.output) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response if __name__ == '__main__': @@ -43,4 +43,4 @@ def view(self, params, post_data): #print ac.api('branding/edit', branding) ## view - print ac.api('branding/view') + print(ac.api('branding/view')) From 6e1a1f6410b05660ea33a7bb2c6581704d4a6134 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:43:02 -0500 Subject: [PATCH 24/34] Update Form.py --- includes/Form.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/Form.py b/includes/Form.py index f9df7c3..aad3a0d 100644 --- a/includes/Form.py +++ b/includes/Form.py @@ -1,7 +1,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib class Form(ActiveCampaign): @@ -12,13 +12,13 @@ def __init__(self, url, api_key): def getforms(self, params, post_data = {}): request_url = '%s&api_action=form_getforms&api_output=%s' % (self.url, self.output) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def html(self, params, post_data = {}): request_url = '%s&api_action=form_html&api_output=%s&%s' % (self.url, self.output, params) - #print urllib2.urlopen(request_url).read() - response = json.loads(urllib2.urlopen(request_url).read()) + #print urllib.request.urlopen(request_url).read() + response = json.loads(urllib.request.urlopen(request_url).read()) return response if __name__ == '__main__': From ea694ff5da4b96413abba065f55cdd17724a1176 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:43:57 -0500 Subject: [PATCH 25/34] Update Group.py --- includes/Group.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/Group.py b/includes/Group.py index 875c22c..8650b93 100644 --- a/includes/Group.py +++ b/includes/Group.py @@ -2,7 +2,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib class Group(ActiveCampaign): @@ -14,35 +14,35 @@ def __init__(self, url, api_key): def add(self, params, post_data): request_url = '%s&api_action=group_add&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def delete_list(self, params, post_data = {}): request_url = '%s&api_action=group_delete_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def delete(self, params, post_data = {}): request_url = '%s&api_action=group_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def edit(self, params, post_data): request_url = '%s&api_action=group_edit&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def list_(self, params, post_data = {}): request_url = '%s&api_action=group_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def view(self, params, post_data = {}): request_url = '%s&api_action=group_view&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response if __name__ == '__main__': From 14bb14f2ae6885605850448052c32f5934e92d29 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:44:43 -0500 Subject: [PATCH 26/34] Update List.py --- includes/List.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/includes/List.py b/includes/List.py index 08ac2e9..80cc7ae 100644 --- a/includes/List.py +++ b/includes/List.py @@ -2,7 +2,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib class List(ActiveCampaign): @@ -14,64 +14,64 @@ def __init__(self, url, api_key): def add(self, params, post_data): request_url = '%s&api_action=list_add&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def delete(self, params, post_data = {}): request_url = '%s&api_action=list_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def delete_list(self, params, post_data = {}): request_url = '%s&api_action=list_delete_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def edit(self, params, post_data): request_url = '%s&api_action=list_edit&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def field_add(self, params, post_data): request_url = '%s&api_action=list_field_add&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def field_delete(self, params, post_data = {}): request_url = '%s&api_action=list_field_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def field_edit(self, params, post_data): request_url = '%s&api_action=list_field_edit&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def field_view(self, params, post_data = {}): request_url = '%s&api_action=list_field_view&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def list_(self, params, post_data = {}): request_url = '%s&api_action=list_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def paginator(self, params, post_data = {}): request_url = '%s&api_action=list_paginator&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def view(self, params, post_data = {}): request_url = '%s&api_action=list_view&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response if __name__ == '__main__': From c170702bef9fbd3db0fa43005465c24938b6a7bc Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:45:29 -0500 Subject: [PATCH 27/34] Update Message.py --- includes/Message.py | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/includes/Message.py b/includes/Message.py index 60903d3..2528cc7 100644 --- a/includes/Message.py +++ b/includes/Message.py @@ -1,8 +1,7 @@ - from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib import datetime class Message(ActiveCampaign): @@ -15,81 +14,81 @@ def __init__(self, url, api_key): def add(self, params, post_data): request_url = '%s&api_action=message_add&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def delete_list(self, params, post_data = {}): request_url = '%s&api_action=message_delete_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def delete(self, params, post_data = {}): request_url = '%s&api_action=message_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def edit(self, params, post_data): request_url = '%s&api_action=message_edit&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def list_(self, params, post_data = {}): request_url = '%s&api_action=message_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def template_add(self, params, post_data): request_url = '%s&api_action=message_template_add&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def template_delete_list(self, params, post_data = {}): request_url = '%s&api_action=message_template_delete_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def template_delete(self, params, post_data = {}): request_url = '%s&api_action=message_template_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def template_edit(self, params, post_data): request_url = '%s&api_action=message_template_edit&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def template_export(self, params, post_data = {}): request_url = '%s&api_action=message_template_export&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def template_import(self, params, post_data): request_url = '%s&api_action=message_template_import&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + response = json.loads(urllib.request.urlopen(req).read()) return response def template_list(self, params, post_data = {}): request_url = '%s&api_action=message_template_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def template_view(self, params, post_data = {}): request_url = '%s&api_action=message_template_view&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def view(self, params, post_data = {}): request_url = '%s&api_action=message_view&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response From 28be13ab5f2fda83073e2dfb4f599c7ba7bb933b Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:46:20 -0500 Subject: [PATCH 28/34] Update Subscriber.py --- includes/Subscriber.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/includes/Subscriber.py b/includes/Subscriber.py index fecb5c7..7dfd636 100644 --- a/includes/Subscriber.py +++ b/includes/Subscriber.py @@ -1,8 +1,7 @@ - from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib class Subscriber(ActiveCampaign): @@ -16,35 +15,35 @@ def add(self, params, post_data): if params: request_url = '%s&%s' % (request_url, params) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def delete(self, params, post_data = {}): request_url = '%s&api_action=subscriber_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def delete_list(self, params, post_data = {}): request_url = '%s&api_action=subscriber_delete_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def edit(self, params, post_data): request_url = '%s&api_action=subscriber_edit&api_output=%s&%s' % (self.url, self.output, params) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def list_(self, params, post_data = {}): request_url = '%s&api_action=subscriber_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def paginator(self, params, post_data = {}): request_url = '%s&api_action=subscriber_paginator&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def sync(self, params, post_data): @@ -52,8 +51,8 @@ def sync(self, params, post_data): if params: request_url = '%s&%s' % (request_url, params) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def view(self, params, post_data = {}): @@ -66,7 +65,7 @@ def view(self, params, post_data = {}): else: action = 'subscriber_view' request_url = '%s&api_action=%s&api_output=%s&%s' % (self.url, action, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response if __name__ == '__main__': From b8bff08cba559a8ccc2d7c572af80d38fcf5694d Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:47:21 -0500 Subject: [PATCH 29/34] Update User.py --- includes/User.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/includes/User.py b/includes/User.py index b3f686d..6ac3f76 100644 --- a/includes/User.py +++ b/includes/User.py @@ -1,4 +1,3 @@ - from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json @@ -14,35 +13,35 @@ def __init__(self, url, api_key): def add(self, params, post_data): request_url = '%s&api_action=user_add&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def delete_list(self, params, post_data = {}): request_url = '%s&api_action=user_delete_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def delete(self, params, post_data = {}): request_url = '%s&api_action=user_delete&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def edit(self, params, post_data): request_url = '%s&api_action=user_edit&api_output=%s' % (self.url, self.output) post_data = urllib.urlencode(post_data) - req = urllib2.Request(request_url, post_data) - response = json.loads(urllib2.urlopen(req).read()) + req = urllib.request.Request(request_url, post_data) + response = json.loads(urllib.request.urlopen(req).read()) return response def list_(self, params, post_data = {}): request_url = '%s&api_action=user_list&api_output=%s&%s' % (self.url, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def me(self, params, post_data = {}): request_url = '%s&api_action=user_me&api_output=%s' % (self.url, self.output) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response def view(self, params, post_data = {}): @@ -53,7 +52,7 @@ def view(self, params, post_data = {}): elif params.startswith('id='): action = 'user_view' request_url = '%s&api_action=%s&api_output=%s&%s' % (self.url, action, self.output, params) - response = json.loads(urllib2.urlopen(request_url).read()) + response = json.loads(urllib.request.urlopen(request_url).read()) return response if __name__ == '__main__': From 540f03969cc509f46ede39daaf81f45bc475a3ce Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Fri, 28 Apr 2017 14:47:48 -0500 Subject: [PATCH 30/34] Update User.py --- includes/User.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/User.py b/includes/User.py index 6ac3f76..2fe8032 100644 --- a/includes/User.py +++ b/includes/User.py @@ -1,7 +1,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.ActiveCampaign import ActiveCampaign import json -import urllib2, urllib +import urllib class User(ActiveCampaign): From d8fe9667f57934a1583178f6c34333773715ce90 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Sat, 29 Apr 2017 15:27:56 -0500 Subject: [PATCH 31/34] Update ActiveCampaign.py --- includes/ActiveCampaign.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/ActiveCampaign.py b/includes/ActiveCampaign.py index edd7116..fb3de9f 100644 --- a/includes/ActiveCampaign.py +++ b/includes/ActiveCampaign.py @@ -40,7 +40,7 @@ def api(self, path, post_data = {}): component = 'auth' class1 = '%s' % component.capitalize() # IE: "subscriber" becomes "Subscriber" - source_module = __import__(class1, globals(), locals(), [], -1) # import Subscriber + source_module = __import__(class1, globals(), locals(), [], 0) # import Subscriber class1 = getattr(source_module, class1) # get Subscriber class1 = class1(ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY) # Subscriber() # subscriber.view() From fa492c8daac87cf00a1a9018498f5b68e6dc750a Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Sat, 29 Apr 2017 15:48:05 -0500 Subject: [PATCH 32/34] Update ActiveCampaign.py --- includes/ActiveCampaign.py | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/ActiveCampaign.py b/includes/ActiveCampaign.py index fb3de9f..262b61c 100644 --- a/includes/ActiveCampaign.py +++ b/includes/ActiveCampaign.py @@ -40,6 +40,7 @@ def api(self, path, post_data = {}): component = 'auth' class1 = '%s' % component.capitalize() # IE: "subscriber" becomes "Subscriber" + class1 ='includes.'+class1 source_module = __import__(class1, globals(), locals(), [], 0) # import Subscriber class1 = getattr(source_module, class1) # get Subscriber class1 = class1(ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY) # Subscriber() From f2d47a2b0f767a0f61df6f46e8cf770fca90819f Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Sat, 29 Apr 2017 16:17:53 -0500 Subject: [PATCH 33/34] Update ActiveCampaign.py --- includes/ActiveCampaign.py | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/ActiveCampaign.py b/includes/ActiveCampaign.py index 262b61c..d3d9b15 100644 --- a/includes/ActiveCampaign.py +++ b/includes/ActiveCampaign.py @@ -42,6 +42,7 @@ def api(self, path, post_data = {}): class1 = '%s' % component.capitalize() # IE: "subscriber" becomes "Subscriber" class1 ='includes.'+class1 source_module = __import__(class1, globals(), locals(), [], 0) # import Subscriber + class1 = '%s' % component.capitalize() # IE: "subscriber" becomes "Subscriber" class1 = getattr(source_module, class1) # get Subscriber class1 = class1(ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY) # Subscriber() # subscriber.view() From 1a0c031652c62cdabc1295c5c3036ee7f3e7e705 Mon Sep 17 00:00:00 2001 From: michael-o-leary Date: Sun, 30 Apr 2017 15:49:03 -0500 Subject: [PATCH 34/34] Update ActiveCampaign.py --- includes/ActiveCampaign.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/ActiveCampaign.py b/includes/ActiveCampaign.py index d3d9b15..806d227 100644 --- a/includes/ActiveCampaign.py +++ b/includes/ActiveCampaign.py @@ -1,6 +1,7 @@ from includes.Config import ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY from includes.Connector import Connector +from importlib import import_module class ActiveCampaign(Connector): @@ -40,9 +41,7 @@ def api(self, path, post_data = {}): component = 'auth' class1 = '%s' % component.capitalize() # IE: "subscriber" becomes "Subscriber" - class1 ='includes.'+class1 - source_module = __import__(class1, globals(), locals(), [], 0) # import Subscriber - class1 = '%s' % component.capitalize() # IE: "subscriber" becomes "Subscriber" + source_module = import_module('.'+class1, 'includes') # import Subscriber class1 = getattr(source_module, class1) # get Subscriber class1 = class1(ACTIVECAMPAIGN_URL, ACTIVECAMPAIGN_API_KEY) # Subscriber() # subscriber.view()