From fc3b424a484ffeea7643ab8129cacb0437d072d6 Mon Sep 17 00:00:00 2001 From: Alexander Blair Date: Fri, 25 Mar 2016 09:10:38 -0700 Subject: [PATCH] Python3 rebuild. --- authorizenet/apicontrollersbase.py | 18 +++++++----------- authorizenet/constants.py | 4 ++-- authorizenet/utility.py | 4 ++-- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/authorizenet/apicontrollersbase.py b/authorizenet/apicontrollersbase.py index a9d8d91..eee87cc 100644 --- a/authorizenet/apicontrollersbase.py +++ b/authorizenet/apicontrollersbase.py @@ -8,7 +8,6 @@ import pyxb import xml.dom.minidom from pip._vendor import requests -from _pyio import __metaclass__ from authorizenet.constants import constants from authorizenet import apicontractsv1 @@ -18,9 +17,7 @@ from authorizenet.apicontractsv1 import ANetApiRequest from authorizenet.apicontractsv1 import ANetApiResponse ''' -class APIOperationBaseInterface(object): - - __metaclass__ = abc.ABCMeta +class APIOperationBaseInterface(object, metaclass=abc.ABCMeta): @abc.abstractmethod def execute(self): @@ -65,9 +62,8 @@ def beforeexecute(self): '''TODO''' pass -class APIOperationBase(APIOperationBaseInterface): - __metaclass__ = abc.ABCMeta - +class APIOperationBase(APIOperationBaseInterface, metaclass=abc.ABCMeta): + __initialized = False __merchantauthentication = "null" __environment = "null" @@ -95,8 +91,8 @@ def buildrequest(self): xmlRequest = self._request.toxml(encoding=constants.xml_encoding, element_name=self.getrequesttype()) #remove namespaces that toxml() generates - xmlRequest = xmlRequest.replace(constants.nsNamespace1, '') - xmlRequest = xmlRequest.replace(constants.nsNamespace2, '') + xmlRequest = xmlRequest.replace(constants.nsNamespace1, b'') + xmlRequest = xmlRequest.replace(constants.nsNamespace2, b'') return xmlRequest @@ -144,7 +140,7 @@ def execute(self): else: if type(self.getresponseclass()) == type(self._response): if self._response.messages.resultCode == "Error": - print "Response error" + print("Response error") domResponse = xml.dom.minidom.parseString(self._httpResponse) logging.debug('Received response: %s' % domResponse.toprettyxml()) @@ -152,7 +148,7 @@ def execute(self): #Need to handle ErrorResponse logging.debug('Error retrieving response for request: %s' % self._request) else: - print "Did not receive http response" + print("Did not receive http response") return def getresponse(self): diff --git a/authorizenet/constants.py b/authorizenet/constants.py index ef59236..c9e1569 100644 --- a/authorizenet/constants.py +++ b/authorizenet/constants.py @@ -38,10 +38,10 @@ class constants(object): note = ' note="Status with a capital \'S\' is obsolete."' '''ns namespace 1''' - nsNamespace1 = 'ns1:' + nsNamespace1 = b'ns1:' '''ns namespace 2''' - nsNamespace2 = ':ns1' + nsNamespace2 = b':ns1' '''default log file name''' defaultLogFileName = "anetsdk.log" diff --git a/authorizenet/utility.py b/authorizenet/utility.py index a37507a..fdaf559 100644 --- a/authorizenet/utility.py +++ b/authorizenet/utility.py @@ -4,8 +4,8 @@ @author: krgupta ''' -from ConfigParser import SafeConfigParser -from ConfigParser import NoSectionError +from configparser import SafeConfigParser +from configparser import NoSectionError import os import sys #from __future__ import print_function