V1.0.1 updates (salesforce-marketingcloud#85)

* bumping version no to 1.0.0 to support Python 3.3 +

* removed print messages

* has_key removed in python 3

'key in dict' has existed for a long time and is much more pythonic;
accordingly, this change is backwards compatible.

* Remove arbitrary call to print()

* Add method to get profile attributes of Subcriber

* Changed iteritems() to items() for Python3 support
Updated version

* py3 support (salesforce-marketingcloud#82)

Support for Python 3.3.3

* V1.0.1 changes. Readme, wsdl file updated. Py3 support added. (salesforce-marketingcloud#83)

* py3 support

* updated wsdl file

* updated readme

* readme

* readme

* readme change

* Create ExactTargetWSDL.xml

* v1.0.1 updates.

* Update README.md

Author: smunuswami

FuelSDK/ExactTargetWSDL.xml

@@ -1,16 +1,16 @@
-__version__ = '0.9.4'
+__version__ = '1.0.1'
 
 # Runtime patch the suds library
-from suds_patch import _PropertyAppender
+from FuelSDK.suds_patch import _PropertyAppender
 from suds.mx import appender as _appender
 _appender.PropertyAppender = _PropertyAppender
 
-from suds_patch import _bodycontent
+from FuelSDK.suds_patch import _bodycontent
 from suds.bindings import document as _document
 _document.Document.bodycontent = _bodycontent
 # end runtime patching of suds
 
-from client import ET_Client
+from FuelSDK.client import ET_Client
 
 # Import all the wrapper objects
-from objects import *
+from FuelSDK.objects import *

FuelSDK/__init__.py

@@ -1,6 +1,6 @@
 import os
 import logging
-import ConfigParser
+import configparser
 import time
 import json
 
@@ -10,7 +10,8 @@
 import suds.wsse
 from suds.sax.element import Element
 
-from objects import ET_DataExtension,ET_Subscriber
+
+from FuelSDK.objects import ET_DataExtension,ET_Subscriber
 
 
 class ET_Client(object):
@@ -33,7 +34,7 @@ class ET_Client(object):
     auth_url = None
 
     ## get_server_wsdl - if True and a newer WSDL is on the server than the local filesystem retrieve it
-    def __init__(self, get_server_wsdl = False, debug = False, params = None):
+    def __init__(self, get_server_wsdl = False, debug = False, params = None, tokenResponse=None):
         self.debug = debug
         if debug:
             logging.basicConfig(level=logging.INFO)
@@ -45,7 +46,7 @@ def __init__(self, get_server_wsdl = False, debug = False, params = None):
             logging.getLogger('suds').setLevel(logging.INFO)
 
         ## Read the config information out of config.python
-        config = ConfigParser.RawConfigParser()
+        config = configparser.RawConfigParser()
         if os.path.exists(os.path.expanduser('~/.fuelsdk/config.python')):
             config.read(os.path.expanduser('~/.fuelsdk/config.python'))
         else:

FuelSDK/client.py

@@ -1,4 +1,4 @@
-from rest import ET_CUDSupport,ET_CUDSupportRest,ET_GetSupport,ET_Get,ET_Patch,ET_Post,ET_Delete,ET_Configure
+from FuelSDK.rest import ET_CUDSupport,ET_CUDSupportRest,ET_GetSupport,ET_Get,ET_Patch,ET_Post,ET_Delete,ET_Configure,ET_Describe
 
 ########
 ##
@@ -37,6 +37,9 @@ def post(self):
             self.last_request_id = obj.request_id
         return obj
 
+    def get(self):
+        return ET_Describe(self.auth_stub, 'Subscriber')
+
 ########
 ##
 ##  wrap an Exact Target Bounce Event
@@ -145,7 +148,7 @@ def __init__(self):
         self.obj_type = 'TriggeredSendDefinition'
 
     def send(self):
-        tscall = {"TriggeredSendDefinition" : self.props, "Subscribers" : self.subscribers, "Attributes": self.attributes }
+        tscall = {"TriggeredSendDefinition":self.props, "Subscribers" : self.subscribers, "Attributes": self.attributes }
         self.obj = ET_Post(self.auth_stub, "TriggeredSend", tscall)
         return self.obj
 
@@ -279,7 +282,7 @@ def post(self):
                 currentFields = []
                 currentProp = {}
 
-                for key, value in rec.iteritems():
+                for key, value in rec.items():
                     currentFields.append({"Name" : key, "Value" : value})
 
                 currentProp['CustomerKey'] = self.CustomerKey
@@ -294,7 +297,7 @@ def post(self):
             currentFields = []
             currentProp = {}
 
-            for key, value in self.props.iteritems():
+            for key, value in self.props.items():
                 currentFields.append({"Name" : key, "Value" : value})
 
             currentProp['CustomerKey'] = self.CustomerKey
@@ -314,7 +317,7 @@ def patch(self):
                 currentFields = []
                 currentProp = {}
 
-                for key, value in rec.iteritems():
+                for key, value in rec.items():
                     currentFields.append({"Name" : key, "Value" : value})
 
                 currentProp['CustomerKey'] = self.CustomerKey
@@ -328,7 +331,7 @@ def patch(self):
             currentFields = []
             currentProp = {}
 
-            for key, value in self.props.iteritems():
+            for key, value in self.props.items():
                 currentFields.append({"Name" : key, "Value" : value})
 
             currentProp['CustomerKey'] = self.CustomerKey
@@ -347,7 +350,7 @@ def delete(self):
                 currentFields = []
                 currentProp = {}
 
-                for key, value in rec.iteritems():
+                for key, value in rec.items():
                     currentFields.append({"Name" : key, "Value" : value})
 
                 currentProp['CustomerKey'] = self.CustomerKey
@@ -361,7 +364,7 @@ def delete(self):
             currentFields = []
             currentProp = {}
 
-            for key, value in self.props.iteritems():
+            for key, value in self.props.items():
                 currentFields.append({"Name" : key, "Value" : value})
 
             currentProp['CustomerKey'] = self.CustomerKey

FuelSDK/objects.py

@@ -64,12 +64,11 @@ def __init__(self, response = None, rest = False):
                     self.status = False
 
     def parse_props_dict_into_ws_object(self, obj_type, ws_object, props_dict):
-        for k, v in props_dict.iteritems():
+        for k, v in list(props_dict.items()):
             if k in ws_object:
                 ws_object[k] = v
             else:
                 message = k + ' is not a property of ' + obj_type
-                print message
                 raise Exception(message)
         return ws_object
 
@@ -90,7 +89,6 @@ def parse_props_into_ws_object(self, auth_stub, obj_type, props):
             return ws_create_list
         else:
             message = 'Can not post properties to ' + obj_type + ' without a dict or list of properties'
-            print message
             raise Exception(message)
 
 ########
@@ -157,12 +155,12 @@ def __init__(self, auth_stub, obj_type, props = None, search_filter = None, opti
 
         if props is not None:
             if type(props) is dict: # If the properties is a hash, then we just want to use the keys
-                ws_retrieveRequest.Properties = props.keys()
+                ws_retrieveRequest.Properties = list(props.keys())
             else:
                 ws_retrieveRequest.Properties = props
 
         if search_filter is not None:
-            if search_filter.has_key('LogicalOperator'):
+            if 'LogicalOperator' in search_filter:
                 ws_simpleFilterPartLeft = auth_stub.soap_client.factory.create('SimpleFilterPart')
                 for prop in ws_simpleFilterPartLeft:
                     #print prop[0]
@@ -180,7 +178,7 @@ def __init__(self, auth_stub, obj_type, props = None, search_filter = None, opti
                 ws_complexFilterPart.LogicalOperator = search_filter['LogicalOperator']
                 for additional_operand in search_filter.get('AdditionalOperands', []):
                     ws_simpleFilterPart = auth_stub.soap_client.factory.create('SimpleFilterPart')
-                    for k, v in additional_operand.items():
+                    for k, v in list(additional_operand.items()):
                         ws_simpleFilterPart[k] = v
                     ws_complexFilterPart.AdditionalOperands.Operand.append(ws_simpleFilterPart)
 
@@ -193,9 +191,9 @@ def __init__(self, auth_stub, obj_type, props = None, search_filter = None, opti
                 ws_retrieveRequest.Filter = ws_simpleFilterPart
 
         if options is not None:
-            for key, value in options.iteritems():
+            for key, value in options.items():
                 if isinstance(value, dict):
-                    for k, v in value.iteritems():
+                    for k, v in value.items():
                         ws_retrieveRequest.Options[key][k] = v
                 else:
                     ws_retrieveRequest.Options[key] = value
@@ -215,7 +213,6 @@ def __init__(self, auth_stub, obj_type, props = None, search_filter = None, opti
 class ET_Post(ET_Constructor):
     def __init__(self, auth_stub, obj_type, props = None):
         auth_stub.refresh_token()
-
         response = auth_stub.soap_client.service.Create(None, self.parse_props_into_ws_object(auth_stub, obj_type, props))
         if(response is not None):
             super(ET_Post, self).__init__(response)
@@ -295,7 +292,7 @@ def get(self, m_props = None, m_filter = None, m_options = None):
         if m_props is not None and type(m_props) is list:
             props = m_props     
         elif self.props is not None and type(self.props) is dict:
-            props = self.props.keys()
+            props = list(self.props.keys())
 
         if m_filter is not None and type(m_filter) is dict:
             search_filter = m_filter
@@ -396,7 +393,7 @@ def __init__(self):
 
     def post(self):
         if self.extProps is not None:
-            for k, v in self.extProps.iteritems():
+            for k, v in self.extProps.items():
                 self.props[k.capitalize] = v
 
         obj = ET_Post(self.auth_stub, self.obj_type, self.props)
@@ -437,7 +434,7 @@ def get(self, props = None):
         additionalQS = {}
 
         if self.props is not None and type(self.props) is dict:
-            for k, v in self.props.iteritems():
+            for k, v in self.props.items():
                 if k in self.urlProps:
                     completeURL = completeURL.replace('{{{0}}}'.format(k), v)
                 else:
@@ -511,7 +508,7 @@ def post(self):
         completeURL = self.endpoint 
 
         if self.props is not None and type(self.props) is dict:
-            for k, v in self.props.iteritems():
+            for k, v in self.props.items():
                 if k in self.urlProps:
                     completeURL = completeURL.replace('{{{0}}}'.format(k), v)
 
@@ -534,7 +531,7 @@ def patch(self):
                 raise "Unable to process request due to missing required prop: #{value}"
 
         if self.props is not None and type(self.props) is dict:
-            for k, v in self.props.iteritems():
+            for k, v in self.props.items():
                 if k in self.urlProps:
                     completeURL = completeURL.replace('{{{0}}}'.format(k), v)
 
@@ -549,7 +546,7 @@ def delete(self):
                 raise "Unable to process request due to missing required prop: #{value}"
 
         if self.props is not None and type(self.props) is dict:     
-            for k, v in self.props.iteritems():
+            for k, v in self.props.items():
                 if k in self.urlProps:
                     completeURL = completeURL.replace('{{{0}}}'.format(k), v)
 

FuelSDK/rest.py

@@ -1,4 +1,4 @@
-Copyright (c) 2013 ExactTarget
+Copyright (c) 2017 Salesforce
 
 Licensed under the MIT License (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the COPYING file.