Merge remote-tracking branch 'upstream/master' into readme

adavidw · adavidw · commit 06012ebb2a7b · 2017-07-03T14:18:06.000-06:00
diff --git a/authorizenet/apicontractsv1.py b/authorizenet/apicontractsv1.py
diff --git a/authorizenet/apicontrollers.py b/authorizenet/apicontrollers.py
@@ -646,7 +646,27 @@ def getrequesttype(self):
     def getresponseclass(self):
         ''' Returns the response class '''
         return apicontractsv1.getTransactionListResponse() 
+
+class getTransactionListForCustomerController(apicontrollersbase.APIOperationBase):
+    		    
+    def __init__(self, apirequest):
+        super(getTransactionListForCustomerController, self).__init__(apirequest)
+        return 
+    
+    def validaterequest(self):
+        logging.debug('performing custom validation..') 
+        #validate required fields
+        #if (self._request.xyz == "null"):
+        #    raise ValueError('xyz is required')         
+        return
     
+    def getrequesttype(self):
+        '''Returns request type''' 
+        return 'getTransactionListForCustomerRequest'
+    def getresponseclass(self):
+        ''' Returns the response class '''
+        return apicontractsv1.getTransactionListResponse()
+		
 class getUnsettledTransactionListController(apicontrollersbase.APIOperationBase):
     
     def __init__(self, apirequest):
diff --git a/authorizenet/apicontrollersbase.py b/authorizenet/apicontrollersbase.py
@@ -147,20 +147,20 @@ def execute(self):
                  
             except Exception as objectifyexception:
                 logging.error( 'Create Document Exception: %s, %s', type(objectifyexception), objectifyexception.args )
-                pyxb.GlobalValidationConfig._setForBinding(False)
-                self._response = apicontractsv1.CreateFromDocument(self._httpResponse)    
-                #objectify code 
-                xmlResponse= self._response.toxml(encoding=constants.xml_encoding, element_name=self.getrequesttype()) 
-                xmlResponse = xmlResponse.replace(constants.nsNamespace1, b'')
-                xmlResponse = xmlResponse.replace(constants.nsNamespace2, b'') 
-                self._mainObject = objectify.fromstring(xmlResponse) 
-            else:    
+                responseString = self._httpResponse
+
+                # removing encoding attribute as objectify fails if it is present
+                responseString = responseString.replace('encoding=\"utf-8\"', '')
+                self._mainObject = objectify.fromstring(responseString) 
+            else:
+                domResponse = xml.dom.minidom.parseString(self._httpResponse)
+
                 #if type(self.getresponseclass()) == type(self._response):
                 if type(self.getresponseclass()) != type(self._mainObject):
                     if self._response.messages.resultCode == "Error":
                         logging.debug("Response error")
-                    domResponse = xml.dom.minidom.parseString(self._httpResponse)
-                    logging.debug('Received response: %s' % domResponse.toprettyxml())
+                    domResponse = xml.dom.minidom.parseString(self._httpResponse.encode('utf-8').decode('utf-8'))
+                    logging.debug('Received response: %s' % domResponse.toprettyxml(encoding='utf-8'))
                 else:
                     #Need to handle ErrorResponse  
                     logging.debug('Error retrieving response for request: %s' % self._request)
diff --git a/authorizenet/constants.py b/authorizenet/constants.py
@@ -16,7 +16,7 @@ class constants(object):
     PRODUCTION = 'https://api2.authorize.net/xml/v1/request.api'
 
     '''clientId'''
-    version = '1.0.13'
+    version = '1.0.14'
     clientId = 'sdk-python-' + version
 
     '''xml encoding'''
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.0.13',
+    version='1.0.14',
 
     description='Authorize.Net Python SDK',
 
@@ -62,7 +62,7 @@
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['pyxb', 'nose', 'mock', 'lxml'],
+    install_requires=['pyxb==1.2.5', 'nose', 'mock', 'lxml'],
 	#install_requires=['nose'],
 	#install_requires=['nosetests'],
 	#install_requires=['mock'],
diff --git a/tests/testpyxb.py b/tests/testpyxb.py
@@ -171,7 +171,7 @@ def testGetCustomerProfile(self):
             
             logging.error( 'Create Document Exception: %s, %s', type(ex), ex.args )
         
-        self.assertEquals(type(getCustomerProfileRequest), type(deserializedObject), "deseriaziedObject does not match original object")
+        self.assertEqual(type(getCustomerProfileRequest), type(deserializedObject), "deseriaziedObject does not match original object")
         
         try:
             #print("starting with element in mid")
